diff --git a/interface/resources/qml/ToolWindow.qml b/interface/resources/qml/ToolWindow.qml
index 8e42f67ebc..9aad639ff3 100644
--- a/interface/resources/qml/ToolWindow.qml
+++ b/interface/resources/qml/ToolWindow.qml
@@ -103,6 +103,8 @@ Windows.Window {
         if (index < 0) {
             return;
         }
+        var tab = tabView.getTab(index);
+        tab.enabledChanged.disconnect(updateVisiblity);
         tabView.removeTab(index);
         console.log("Updating visibility based on child tab removed");
         updateVisiblity();
@@ -137,10 +139,7 @@ Windows.Window {
         }
 
         console.log("Updating visibility based on child tab added");
-        newTab.enabledChanged.connect(function() {
-            console.log("Updating visibility based on child tab enabled change");
-            updateVisiblity();
-        })
+        newTab.enabledChanged.connect(updateVisiblity)
         updateVisiblity();
         return newTab
     }