diff --git a/src/view.c b/src/view.c
index f50a5f0f..3ad76bbb 100644
--- a/src/view.c
+++ b/src/view.c
@@ -1233,6 +1233,12 @@ void
 view_toggle_fullscreen(struct view *view)
 {
 	assert(view);
+
+	/* When going to fullscreen, unshade the window */
+	if (!view->fullscreen) {
+		view_set_shade(view, false);
+	}
+
 	view_set_fullscreen(view, !view->fullscreen);
 }
 
@@ -2033,11 +2039,6 @@ view_set_shade(struct view *view, bool shaded)
 		return;
 	}
 
-	/* Restore fullscreen views to natural size before shading */
-	if (shaded && view->fullscreen) {
-		view_toggle_fullscreen(view);
-	}
-
 	view->shaded = shaded;
 	ssd_enable_shade(view->ssd, view->shaded);
 	wlr_scene_node_set_enabled(view->scene_node, !view->shaded);