diff --git a/source/dialogs/window.c b/source/dialogs/window.c
index 31c406e7..154b209d 100644
--- a/source/dialogs/window.c
+++ b/source/dialogs/window.c
@@ -354,6 +354,9 @@ static int window_match ( const Mode *sw, GRegex **tokens, unsigned int index )
             if ( !test && c->name != NULL && c->name[0] != '\0' ) {
                 test = token_match ( ftokens, c->name );
             }
+            if ( !test && c->wmdesktopstr != NULL && c->wmdesktopstr[0] != '\0' ) {
+                test = token_match ( ftokens, c->wmdesktopstr );
+            }
 
             if ( test == 0 ) {
                 match = 0;
diff --git a/source/view.c b/source/view.c
index 4cf5db2e..69792ec4 100644
--- a/source/view.c
+++ b/source/view.c
@@ -1684,6 +1684,8 @@ void rofi_view_set_overlay ( RofiViewState *state, const char *text )
     unsigned int x_offset = state->width - ( 2 * state->border ) - widget_get_width ( WIDGET ( state->case_indicator ) );
     x_offset -= widget_get_width ( WIDGET ( state->overlay ) );
     widget_move ( WIDGET ( state->overlay ), x_offset, state->border );
+    // We want to queue a repaint.
+    rofi_view_queue_redraw ( );
 }
 
 void rofi_view_clear_input ( RofiViewState *state )