diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index bf19bd8..4a5f32d 100644
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -239,9 +239,6 @@
     return true;
   case IDM_CONN_SAVE_AS:
     return true;
-  case ID_CLOSE:
-    // FIXME: Remove the corresponding toolbar button.
-    return true;
   };
   return false;
 }
diff --git a/win/vncviewer/ViewerToolBar.cxx b/win/vncviewer/ViewerToolBar.cxx
index adc6f07..66a50c3 100644
--- a/win/vncviewer/ViewerToolBar.cxx
+++ b/win/vncviewer/ViewerToolBar.cxx
@@ -48,7 +48,6 @@
   addButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP);
   addButton(13, ID_NEW_CONNECTION);
   addButton(14, ID_CONN_SAVE_AS);
-  addButton(15, ID_CLOSE);
 
   // Resize the toolbar window
   autoSize();
@@ -97,9 +96,6 @@
       case ID_CONN_SAVE_AS:
         TTStr->lpszText = "Save connection info as...";
         break;
-      case ID_CLOSE:
-        TTStr->lpszText = "Disconnect";
-        break;
       default:
         break;
       }