diff --git a/app/ui.js b/app/ui.js
index d4a7555da74375b461070db7475cbc585f8ffd3e..0ea85b337779ada645bf5fc26be824f80081205e 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -1220,6 +1220,9 @@ var UI;
                 var resizeMode = UI.getSetting('resize');
                 display.set_scale(1);
 
+                // Make sure the viewport is adjusted first
+                UI.updateViewClip();
+
                 if (resizeMode === 'remote') {
 
                     // Request changing the resolution of the remote display to