diff --git a/src/shell.c b/src/shell.c
index 3d5dfd90..86284627 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1427,6 +1427,7 @@ map(struct weston_shell *base, struct weston_surface *surface,
 		do_configure = 0;
 		break;
 	case SHELL_SURFACE_NONE:
+		do_configure = 0;
 		break;
 	default:
 		/* everything else just below the panel */