diff --git a/src/keyboard.c b/src/keyboard.c
index e754d5f6..93d91071 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -151,6 +151,7 @@ handle_compositor_keybindings(struct wl_listener *listener,
 				if (syms[i] == XKB_KEY_Escape) {
 					/* cancel */
 					server->cycle_view = NULL;
+					osd_finish(server);
 					return true;
 				}
 			}