diff --git a/src/gcal-window.c b/src/gcal-window.c
index 779048cc..f35a05b2 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -360,7 +360,10 @@ save_geometry (gpointer user_data)
                           maximized);
 
   if (maximized)
-    return FALSE;
+    {
+      priv->save_geometry_timeout_id = 0;
+      return FALSE;
+    }
 
   /* save window's size */
   gtk_window_get_size (self,
@@ -386,6 +389,8 @@ save_geometry (gpointer user_data)
                         "window-position",
                         variant);
 
+  priv->save_geometry_timeout_id = 0;
+
   return FALSE;
 }