diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp
index 7b52d1786..fc00f2536 100644
--- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp
+++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp
@@ -280,7 +280,7 @@ void ToolWindowManager::moveToolWindows(QList<QWidget *> toolWindows,
         int availSize = parentSplitterSizes[indexInParentSplitter];
 
         parentSplitterSizes[indexInParentSplitter] = int(availSize * (1.0f - area.percentage()));
-        parentSplitterSizes.insert(indexInParentSplitter, int(availSize * area.percentage()));
+        parentSplitterSizes.insert(insertIndex, int(availSize * area.percentage()));
 
         parentSplitter->setSizes(parentSplitterSizes);
       }
diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp
index 2eb8fbd77..a1865a5b0 100644
--- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp
+++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerWrapper.cpp
@@ -314,6 +314,12 @@ bool ToolWindowManagerWrapper::eventFilter(QObject *object, QEvent *event) {
       } else {
         showMaximized();
       }
+    } else if (event->type() == QEvent::NonClientAreaMouseButtonDblClick) {
+      if (isMaximized()) {
+        showNormal();
+      } else {
+        showMaximized();
+      }
     }
   }
   return QWidget::eventFilter(object, event);