diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/PaneWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/PaneWidget.cpp
index 82600d21..5758b5ee 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/PaneWidget.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/PaneWidget.cpp
@@ -24,9 +24,7 @@ namespace Bloom::Widgets
     }
 
     void PaneWidget::deactivate() {
-        if (this->isVisible()) {
-            this->hide();
-        }
+        this->hide();
 
         this->state.activated = false;
         emit this->paneDeactivated();
@@ -44,6 +42,11 @@ namespace Bloom::Widgets
         }
 
         this->state.attached = false;
+
+        if (this->state.activated) {
+            this->show();
+        }
+
         emit this->paneDetached();
     }
 
@@ -51,6 +54,10 @@ namespace Bloom::Widgets
         this->setWindowFlag(Qt::Window, false);
 
         this->state.attached = true;
+
+        if (this->state.activated) {
+            this->show();
+        }
         emit this->paneAttached();
     }
 
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp
index 42617ff0..97f157d0 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/TargetMemoryInspectionPane.cpp
@@ -188,12 +188,18 @@ namespace Bloom::Widgets
         );
 
         // Restore the state
-        if (!this->state.attached) {
+        if (this->state.attached) {
+            this->attach();
+
+        } else {
             this->detach();
         }
 
         if (this->state.activated) {
             this->activate();
+
+        } else {
+            this->deactivate();
         }
     }
 
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.cpp
index 5ce85287..f262c031 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.cpp
@@ -144,14 +144,15 @@ namespace Bloom::Widgets
         );
 
         // Restore the state
-        if (!this->state.attached) {
-            // The register pane cannot be detached.
-            this->state.attached = true;
-        }
-
         if (this->state.activated) {
             this->activate();
+
+        } else {
+            this->deactivate();
         }
+
+        // The register pane cannot be detached.
+        this->attach();
     }
 
     void TargetRegistersPaneWidget::filterRegisters(const QString& keyword) {