diff --git a/sway/handlers.c b/sway/handlers.c
index 6d35f8a25..846d0005a 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -410,7 +410,7 @@ static bool handle_view_created(wlc_handle handle) {
 	}
 	wlc_view_set_mask(handle, VISIBLE);
 
-	if (return_to_workspace && current_ws) {
+	if (return_to_workspace && current_ws != swayc_active_workspace()) {
 		// we were on one workspace, switched to another to add this view,
 		// now let's return to where we were
 		workspace_switch(current_ws);