--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Wed Jun 08 20:54:07 2016 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Wed Jun 08 21:18:38 2016 +0900
@@ -881,9 +881,11 @@
             @Override
             public void actionPerformed(ActionEvent e) {
                 fitScreen();
+                /*
                 if (!viewer.getRfb().isTreeManager()) {
                     context.sendMessage(new RequestSingleDisplaySize());
                 }
+                */
             }
         });
 
@@ -1014,9 +1016,13 @@
         int singleWidth = viewer.getRfb().getSingleWidth() * viewer.getRfb().getRetinaScale();
         int singleHeight = viewer.getRfb().getSingleHeight() * viewer.getRfb().getRetinaScale();
         frame.setSize(thisScreenWidth, thisScreenHeight);
-        Rectangle visible = new Rectangle(thatScreenX,thatScreenY,thisScreenWidth,thisScreenHeight);
-        scroller.scrollRectToVisible(visible);
         uiSettings.fitScreen(thisScreenWidth, thisScreenHeight, singleWidth, singleHeight);
+        final Rectangle visible = new Rectangle(thatScreenX,thatScreenY,thisScreenWidth,thisScreenHeight);
+        SwingUtilities.invokeLater(new Runnable(){
+            public void run() {
+                scroller.scrollRectToVisible(visible);
+            }
+        });
     }
 
     private void sendCtrlAltDel(ProtocolContext context) {