diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index 388014f..0d95180 100644
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -223,8 +223,9 @@
     window->setDesktopScale(100);
     return true;
   case IDM_AUTO_SIZE:
-    options.autoScaling = true;
-    window->setAutoScaling(true);
+    options.autoScaling = !options.autoScaling;
+    window->setAutoScaling(options.autoScaling);
+    if (!options.autoScaling) options.scale = window->getDesktopScale();
     return true;
   case IDM_SHOW_TOOLBAR:
     options.showToolbar = !window->isToolbarEnabled();