diff --git a/src/private/FloatingWindow.cpp b/src/private/FloatingWindow.cpp
index c93355b5..e3e3675e 100644
--- a/src/private/FloatingWindow.cpp
+++ b/src/private/FloatingWindow.cpp
@@ -395,6 +395,8 @@ void FloatingWindow::updateTitleBarVisibility()
 
         for (Frame *frame : frames())
             frame->updateTitleBarVisibility();
+
+        m_titleBar->updateButtons();
     } else {
         visible = false;
     }
diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp
index 361d389e..eb901989 100644
--- a/tests/tst_docks.cpp
+++ b/tests/tst_docks.cpp
@@ -3456,7 +3456,7 @@ void TestDocks::tst_restoreSimplest()
 
 void TestDocks::tst_restoreNonClosable()
 {
-    // Tests that restoring state also restores the options
+    // Tests that restoring state also restores the Option_NotClosable option
 
     {
         // Basic case:
@@ -3501,7 +3501,6 @@ void TestDocks::tst_restoreNonClosable()
         tb = dock2->frame()->actualTitleBar();
         QVERIFY(tb->isVisible());
 
-        QEXPECT_FAIL("", "Bug #137", Continue);
         QVERIFY(!tb->closeButtonEnabled());
     }
 }