diff --git a/src/server-context-service.c b/src/server-context-service.c
index 33f1101f..4466ab8b 100644
--- a/src/server-context-service.c
+++ b/src/server-context-service.c
@@ -233,11 +233,6 @@ server_context_service_real_show_keyboard (ServerContextService *self)
         return;
     }
 
-    if (self->hiding) {
-	    g_source_remove (self->hiding);
-	    self->hiding = 0;
-    }
-
     if (!self->window) {
         make_window (self);
     }
@@ -269,6 +264,11 @@ server_context_service_show_keyboard (ServerContextService *self)
 {
     g_return_if_fail (SERVER_IS_CONTEXT_SERVICE(self));
 
+    if (self->hiding) {
+        g_source_remove (self->hiding);
+        self->hiding = 0;
+    }
+
     if (!self->visible) {
         server_context_service_real_show_keyboard (self);
     }