1 files changed, 10 insertions, 15 deletions
diff --git a/src/Authoring/Qt3DStudio/Palettes/PaletteManager.cpp b/src/Authoring/Qt3DStudio/Palettes/PaletteManager.cpp
index f83a5df6..e30512e9 100644
--- a/src/Authoring/Qt3DStudio/Palettes/PaletteManager.cpp
+++ b/src/Authoring/Qt3DStudio/Palettes/PaletteManager.cpp
@@ -158,6 +158,7 @@ CPaletteManager::CPaletteManager(CMainFrame *inMainFrame, QObject *parent)
                 QSize(defaultRightDockWidth, inMainFrame->height() - defaultProjectHeight),
                 m_inspectorDock);
     inspectorView->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+    actionView->setControlView(inspectorView);
     m_inspectorDock->setWidget(inspectorView);
     inMainFrame->addDockWidget(Qt::RightDockWidgetArea, m_inspectorDock);
     inMainFrame->tabifyDockWidget(m_inspectorDock, m_actionDock);
@@ -165,13 +166,7 @@ CPaletteManager::CPaletteManager(CMainFrame *inMainFrame, QObject *parent)
 
     m_inspectorDock->raise();
 
-    m_basicObjectsDock->setEnabled(false);
-    m_projectDock->setEnabled(false);
-    m_slideDock->setEnabled(false);
-    m_actionDock->setEnabled(false);
-    m_inspectorDock->setEnabled(false);
-    m_timelineDock->setEnabled(false);
-    m_cameraDock->setEnabled(false);
+    EnablePalettes(false);
 }
 
 //==============================================================================
@@ -281,14 +276,14 @@ ProjectView *CPaletteManager::projectView() const
     return m_projectView;
 }
 
-void CPaletteManager::EnablePalettes()
+void CPaletteManager::EnablePalettes(bool enable)
 {
-    m_basicObjectsDock->setEnabled(true);
-    m_projectDock->setEnabled(true);
-    m_slideDock->setEnabled(true);
-    m_timelineDock->setEnabled(true);
-    m_actionDock->setEnabled(true);
-    m_inspectorDock->setEnabled(true);
-    m_cameraDock->setEnabled(true);
+    m_basicObjectsDock->setEnabled(enable);
+    m_projectDock->setEnabled(enable);
+    m_slideDock->setEnabled(enable);
+    m_timelineDock->setEnabled(enable);
+    m_actionDock->setEnabled(enable);
+    m_inspectorDock->setEnabled(enable);
+    m_cameraDock->setEnabled(enable);
 }