diff --git a/win/vncviewer/DesktopWindow.cxx b/win/vncviewer/DesktopWindow.cxx
index 197449d..0feb24e 100644
--- a/win/vncviewer/DesktopWindow.cxx
+++ b/win/vncviewer/DesktopWindow.cxx
@@ -976,8 +976,12 @@
 void DesktopWindow::setDesktopScaleRatio(double scale_ratio) {
   buffer->setScaleRatio(scale_ratio);
   InvalidateRect(frameHandle, 0, FALSE);
-  calculateScrollBars();
+  if (!isAutoScaling()) calculateScrollBars();
   if (isToolbarEnabled()) refreshToolbarButtons();
+  char *newTitle = new char[strlen(desktopName)+20];
+  sprintf(newTitle, "%s @ %i%%", desktopName, getDesktopScale());
+  SetWindowText(handle, TStr(newTitle));
+  delete [] newTitle;
 }
 
 void DesktopWindow::fitBufferToWindow(bool repaint) {
@@ -1129,6 +1133,7 @@
 void
 DesktopWindow::setName(const char* name) {
   SetWindowText(handle, TStr(name));
+  strCopy(desktopName, name, sizeof(desktopName));
 }