diff --git a/src/view.c b/src/view.c
index db326c3e..61ed97bb 100644
--- a/src/view.c
+++ b/src/view.c
@@ -638,6 +638,10 @@ view_set_fullscreen(struct view *view, bool fullscreen,
 		view_apply_fullscreen_geometry(view, view->fullscreen);
 	} else {
 		view->fullscreen = false;
+		/* Re-show decorations when no longer fullscreen */
+		if (view->ssd_enabled) {
+			decorate(view);
+		}
 		/* Restore non-fullscreen geometry */
 		if (view->maximized) {
 			view_apply_maximized_geometry(view);
@@ -646,10 +650,6 @@ view_set_fullscreen(struct view *view, bool fullscreen,
 		} else {
 			view_apply_unmaximized_geometry(view);
 		}
-		/* Re-show decorations when no longer fullscreen */
-		if (view->ssd_enabled) {
-			decorate(view);
-		}
 	}
 
 	/* Show fullscreen views above top-layer */