diff --git a/guacamole/src/main/webapp/scripts/client-ui.js b/guacamole/src/main/webapp/scripts/client-ui.js
index 9c1879df6..bfd05bca6 100644
--- a/guacamole/src/main/webapp/scripts/client-ui.js
+++ b/guacamole/src/main/webapp/scripts/client-ui.js
@@ -789,7 +789,7 @@ GuacUI.Client.setScale = function(new_scale) {
     GuacUI.Client.auto_fit.checked = (new_scale === GuacUI.Client.min_zoom);
 
     // Disable auto-fit if zoom is required
-    GuacUI.Client.auto_fit.disabled = (GuacUI.Client.min_zoom >= 1);
+    GuacUI.Client.auto_fit.disabled = (GuacUI.Client.min_zoom >= 1 && new_scale === GuacUI.Client.min_zoom);
 
 };