--- /usr/lib/guake/guake.py	2011-07-27 18:25:11.521562875 -0400
+++ /usr/lib/guake/guake.py	2011-07-27 18:29:53.597562846 -0400
@@ -963,7 +963,10 @@
             if not val:
                 self.toolbar.hide()
         else:
+            window_rect = self.get_final_window_rect()
             self.window.unfullscreen()
+            self.window.resize(window_rect.width, window_rect.height)
+            self.window.move(window_rect.x, window_rect.y)
             self.fullscreen = False
 
             # making sure that tabbar and resizer will come back to