diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 2ac29038..a1dc266c 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -86,10 +86,14 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 
         GSList *acts = NULL;
         ObAction* act;
+        ObMenuEntry *e;
+
         act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
         act->data.desktop.desk = d->desktop;
         acts = g_slist_append(acts, act);
-        menu_add_normal(menu, 0, _("Go there..."), acts);
+        e = menu_add_normal(menu, 0, _("Go there..."), acts);
+        if (d->desktop == screen_desktop)
+            e->data.normal.enabled = FALSE;
     }
 }