diff --git a/internal/ui/ui_glfw.go b/internal/ui/ui_glfw.go
index 08e6a51fa..88e30816d 100644
--- a/internal/ui/ui_glfw.go
+++ b/internal/ui/ui_glfw.go
@@ -377,6 +377,13 @@ func (u *userInterface) setScreenSize(width, height int, scale float64, fullscre
 		window.SetMonitor(m, 0, 0, v.Width, v.Height, v.RefreshRate)
 	} else {
 		x, y := window.GetPos()
+		// Reverted from fullscreen
+		if u.origPosX >= 0 && u.origPosY >= 0 {
+			x = u.origPosX
+			y = u.origPosY
+			u.origPosX = -1
+			u.origPosY = -1
+		}
 		// TODO: y must be mirroed on macOS?
 		window.SetMonitor(nil, x, y, 16, 16, v.RefreshRate)
 		ch := make(chan struct{})
@@ -395,10 +402,6 @@ func (u *userInterface) setScreenSize(width, height int, scale float64, fullscre
 			default:
 			}
 		}
-		// Reverted from fullscreen
-		if u.origPosX >= 0 && u.origPosY >= 0 {
-			window.SetPos(u.origPosX, u.origPosY)
-		}
 	}
 	// TODO: Rename this variable?
 	u.sizeChanged = true