diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 7362df5c1..3df38e2d8 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -51,6 +51,9 @@ struct sway_view {
 	double x, y;
 	int width, height;
 
+	double saved_x, saved_y;
+	int saved_width, saved_height;
+
 	// The size the view would want to be if it weren't tiled.
 	// Used when changing a view from tiled to floating.
 	int natural_width, natural_height;
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 2eaa5d495..3117ded68 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -274,6 +274,10 @@ void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
 			view_set_fullscreen(workspace->sway_workspace->fullscreen, false);
 		}
 		workspace->sway_workspace->fullscreen = view;
+		view->saved_x = view->x;
+		view->saved_y = view->y;
+		view->saved_width = view->width;
+		view->saved_height = view->height;
 		view->swayc->saved_x = view->swayc->x;
 		view->swayc->saved_y = view->swayc->y;
 		view->swayc->saved_width = view->swayc->width;
@@ -296,11 +300,12 @@ void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
 		}
 	} else {
 		workspace->sway_workspace->fullscreen = NULL;
-		view->swayc->width = view->swayc->saved_width;
-		view->swayc->height = view->swayc->saved_height;
 		if (container_is_floating(view->swayc)) {
-			view->swayc->x = view->swayc->saved_x;
-			view->swayc->y = view->swayc->saved_y;
+			view_configure(view, view->saved_x, view->saved_y,
+					view->saved_width, view->saved_height);
+		} else {
+			view->swayc->width = view->swayc->saved_width;
+			view->swayc->height = view->swayc->saved_height;
 			view_autoconfigure(view);
 		}
 	}