diff --git a/wince/ceginfo.c b/wince/ceginfo.c
index 0f80dbcc2..fcb3cc7e4 100755
--- a/wince/ceginfo.c
+++ b/wince/ceginfo.c
@@ -276,10 +276,6 @@ ceAdjustVisibility( HWND hDlg, GameInfoState* giState, XP_Bool counterWins )
         result = nDrawn == nToDraw;
     }
 
-#ifndef XWFEATURE_STANDALONE_ONLY
-    ceShowOrHide( hDlg, IDC_CONNBUTTON, serverRole != SERVER_STANDALONE );
-#endif
- 
     return result;
 } /* ceAdjustVisibility */
 
@@ -509,6 +505,7 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
                     }
                     break;
 
+#ifndef XWFEATURE_STANDALONE_ONLY
                 case IDC_ROLECOMBO:
                     if ( HIWORD(wParam) == CBN_SELCHANGE ) {
                         if ( giState->isNewGame ) {  /* ignore if in info mode */
@@ -518,15 +515,15 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
                                                               0L);
                             giState->curServerHilite = (Connectedness)sel;
                             ceAdjustVisibility( hDlg, giState, XP_FALSE );
+
+                            /* If we've switched to a state where we'll be
+                               connecting */
+                            if ( sel != SERVER_STANDALONE ) {
+                                handleConnOptionsButton( hDlg, globals, giState );
+                            }
                         }
                     }
                     break;
-
-#ifndef XWFEATURE_STANDALONE_ONLY
-                case IDC_CONNBUTTON:
-                    XP_LOGF( "calling handleConnOptionsButton" );
-                    handleConnOptionsButton( hDlg, globals, giState );
-                    break;
 #endif
 
 #ifndef STUBBED_DICT
diff --git a/wince/resource.h b/wince/resource.h
index 8b4aef374..8b7b01790 100755
--- a/wince/resource.h
+++ b/wince/resource.h
@@ -80,7 +80,6 @@
 #define IDC_PREFCOLORS                  1044
 #define PHONIES_LABEL                   1045
 #define IDC_ROLECOMBO                   1046
-#define IDC_CONNBUTTON                  1047
 #define IDC_LOCALP_LABEL                1048
 #define IDC_TOTAL_LABEL                 1049
 #define IDC_REMOTE_LABEL                1050
diff --git a/wince/xwords4.rc b/wince/xwords4.rc
index 402d13710..37039636b 100755
--- a/wince/xwords4.rc
+++ b/wince/xwords4.rc
@@ -197,8 +197,6 @@ BEGIN
     LTEXT           "Role:",IDC_STATIC,25,SERVERROLE_ROW,20,8
     COMBOBOX        IDC_ROLECOMBO,45,SERVERROLE_ROW,50,58,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Conn...",IDC_CONNBUTTON,45+50+2,SERVERROLE_ROW,
-                        35, ROW_SPACE
     
 #endif
     LTEXT           "local players",IDC_LOCALP_LABEL,LEFT_COL,NPLAYERS_ROW,40,8