diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp
index 006af2485..3fdaf92e9 100644
--- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp
+++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManagerArea.cpp
@@ -37,7 +37,10 @@ static void showCloseButton(QTabBar *bar, int index, bool show)
     button = bar->tabButton(index, QTabBar::LeftSide);
 
   if(button)
-    button->resize(show ? QSize(16, 16) : QSize(0, 0));
+  {
+    button->resize(show ? QSize(16, 16) : QSize(1, 1));
+    button->setVisible(show);
+  }
 }
 
 ToolWindowManagerArea::ToolWindowManagerArea(ToolWindowManager *manager, QWidget *parent)
@@ -106,15 +109,9 @@ void ToolWindowManagerArea::updateToolWindow(QWidget *toolWindow)
   {
     ToolWindowManagerTabBar *tb = static_cast<ToolWindowManagerTabBar *>(tabBar());
     if(m_manager->toolWindowProperties(toolWindow) & ToolWindowManager::HideCloseButton)
-    {
-      tb->setTabsClosable(false);
       showCloseButton(tabBar(), index, false);
-    }
     else
-    {
-      tb->setTabsClosable(true);
       showCloseButton(tabBar(), index, true);
-    }
     tabBar()->setTabText(index, toolWindow->windowTitle());
   }
 }