diff --git a/src/gui_handler/gui_handler.rs b/src/gui_handler/gui_handler.rs
index ea03478..d29c840 100644
--- a/src/gui_handler/gui_handler.rs
+++ b/src/gui_handler/gui_handler.rs
@@ -874,6 +874,9 @@ impl GuiHandler {
                     current.disable(world)?;
                 }
             }
+            (Some(current), None) => {
+                current.disable(world)?;
+            }
 
             _ => (),
         }
@@ -894,6 +897,9 @@ impl GuiHandler {
                     current.disable(world)?;
                 }
             }
+            (Some(current), None) => {
+                current.disable(world)?;
+            }
 
             _ => (),
         }