diff --git a/data/eekboard-server.service.in b/data/eekboard-server.service.in
index 8f525d8b..16b9b78b 100644
--- a/data/eekboard-server.service.in
+++ b/data/eekboard-server.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.fedorahosted.Eekboard.Server
+Name=org.fedorahosted.Eekboard
 Exec=@bindir@/eekboard-server
diff --git a/src/server-context-service.c b/src/server-context-service.c
index d76c276b..bb7111e0 100644
--- a/src/server-context-service.c
+++ b/src/server-context-service.c
@@ -141,7 +141,8 @@ on_notify_fullscreen (GObject    *object,
                       gpointer    user_data)
 {
     ServerContextService *context = user_data;
-    set_geometry (context);
+    if (context->window)
+        set_geometry (context);
 }
 
 static void