diff --git a/internal/uidriver/glfw/ui.go b/internal/uidriver/glfw/ui.go
index 18c29f072..02331dc23 100644
--- a/internal/uidriver/glfw/ui.go
+++ b/internal/uidriver/glfw/ui.go
@@ -631,6 +631,7 @@ func (u *UserInterface) SetCursorShape(shape driver.CursorShape) {
 
 func (u *UserInterface) DeviceScaleFactor() float64 {
 	if !u.isRunning() {
+		// TODO: Use the initWindowPosition. This requires to convert the units correctly (#1575).
 		return devicescale.GetAt(u.initMonitor.GetPos())
 	}
 
diff --git a/internal/uidriver/glfw/window.go b/internal/uidriver/glfw/window.go
index d7b646590..beaad0869 100644
--- a/internal/uidriver/glfw/window.go
+++ b/internal/uidriver/glfw/window.go
@@ -245,8 +245,7 @@ func (w *window) SetSize(width, height int) {
 }
 
 func (w *window) SizeLimits() (minw, minh, maxw, maxh int) {
-	minw, minh, maxw, maxh = w.ui.getWindowSizeLimitsInDP()
-	return
+	return w.ui.getWindowSizeLimitsInDP()
 }
 
 func (w *window) SetSizeLimits(minw, minh, maxw, maxh int) {