diff --git a/guake/utils.py b/guake/utils.py
index bcf87701b..f02f641fb 100644
--- a/guake/utils.py
+++ b/guake/utils.py
@@ -169,7 +169,7 @@ def set_window_state(self, window_state):
         if not window_state & Gdk.WindowState.WITHDRAWN:
             if self.is_fullscreen():
                 self.fullscreen()
-            elif window_state & Gdk.WindowState.FOCUSED:
+            elif window_state & Gdk.WindowState.FOCUSED and self.guake.hidden:
                 self.unfullscreen()
 
     def fullscreen(self):