diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 1c39a12..7d5bca9 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -2561,6 +2561,13 @@
 	struct shell_surface *shsurf = wl_resource_get_user_data(resource);
 	struct weston_output *output;
 
+	if (shsurf->fullscreen_output == shsurf->output &&
+	    shsurf->fullscreen.type == method &&
+	    shsurf->fullscreen.framerate == framerate) {
+		send_configure_for_surface(shsurf);
+		return;
+	}
+
 	if (output_resource)
 		output = wl_resource_get_user_data(output_resource);
 	else