Index: SumatraPDF.cpp
===================================================================
--- SumatraPDF.cpp	(revision 1127)
+++ SumatraPDF.cpp	(working copy)
@@ -4708,6 +4708,12 @@
     if (!WindowInfo_PdfLoaded(win))
         return;

+    // Don't show a dialog if we don't have to - use the Toolbar instead
+    if (gGlobalPrefs.m_showToolbar) {
+        win->PageStart();
+        return;
+    }
+
     int newPageNo = Dialog_GoToPage(win);
     if (win->dm->validPageNo(newPageNo))
         win->dm->goToPage(newPageNo, 0);
@@ -5734,6 +5740,13 @@
     }
 }

+void WindowInfo::PageStart()
+{
+    hwndTracker = NULL;
+    SendMessage(hwndPageBox, EM_SETSEL, 0, -1);
+    SetFocus(hwndPageBox);
+}
+
 void WindowInfo::TrackMouse(HWND tracker)
 {
     if (!tracker)
Index: SumatraPDF.h
===================================================================
--- SumatraPDF.h	(revision 1127)
+++ SumatraPDF.h	(working copy)
@@ -233,6 +233,7 @@
     void TrackMouse(HWND hwnd=NULL);
     void FindStart();
     virtual void FindUpdateStatus(int count, int total);
+    void PageStart();

 };