diff --git a/gdk/gdk.c b/gdk/gdk.c
index 24167e8f7..e97e5fdb3 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -338,8 +338,9 @@ gdk_init (int    *argc,
 		  i += 1;
 		}
 	    }
+	  else 
 #endif /* G_ENABLE_DEBUG */
-	  else if (strcmp ("--display", (*argv)[i]) == 0)
+	    if (strcmp ("--display", (*argv)[i]) == 0)
 	    {
 	      (*argv)[i] = NULL;
 
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 24167e8f7..e97e5fdb3 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -338,8 +338,9 @@ gdk_init (int    *argc,
 		  i += 1;
 		}
 	    }
+	  else 
 #endif /* G_ENABLE_DEBUG */
-	  else if (strcmp ("--display", (*argv)[i]) == 0)
+	    if (strcmp ("--display", (*argv)[i]) == 0)
 	    {
 	      (*argv)[i] = NULL;