diff --git a/curses/netentry_curses.py b/curses/netentry_curses.py
index c00c887..3eaccf4 100644
--- a/curses/netentry_curses.py
+++ b/curses/netentry_curses.py
@@ -192,11 +192,16 @@ class AdvancedSettingsDialog(urwid.WidgetWrap):
                     self.overlay.mouse_event( dim,
                             event, button, col, row,
                             focus=True)
-                k = self.overlay.keypress(dim, k)
-                if k in ('up','page up'):
-                    self._w.set_focus('body')
-                elif k in ('down','page down'):
-                    self._w.set_focus('footer')
+                else:
+                    k = self.overlay.keypress(dim, k)
+                    if k in ('up','page up'):
+                        self._w.set_focus('body')
+                        # Until I figure out a better way to do this, then this will
+                        # have to do.
+                        self._w.body.get_focus()[0].get_focus()._invalidate()
+                        #self._w.body.keypress(dim,'down')
+                    elif k in ('down','page down'):
+                        self._w.set_focus('footer')
 
             if "window resize" in keys:
                 dim = ui.get_cols_rows()
diff --git a/in/scripts=wicd-client.in b/in/scripts=wicd-client.in
index 776581f..ada45f7 100755
--- a/in/scripts=wicd-client.in
+++ b/in/scripts=wicd-client.in
@@ -10,18 +10,19 @@ fi
 if [ -e "%DOCDIR%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
     ln -s "%DOCDIR%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
 fi
-if [ "$DISPLAY" = "" ] && [ -x "%BIN%wicd-curses" ]; then
-    if [ ! -f "$HOME/.wicd/CLIENT_CURSES_WARNING" ]; then
-        printf "NOTICE: You do not have an X server active on this console, \n"
-        printf "so ${BOLD}${BLUE}wicd-curses${NC} will be started instead. \n"
-        printf "Please see the wicd-client and/or wicd-curses manual pages \n"
-        printf "for more information about this error and resulting message. \n"
-        printf "\n" 
-        printf "This message will not be displayed again. \n"
-        printf "Press enter to continue... \n"
+if [ "$DISPLAY" = "" ]; then
+    if [ -x "%BIN%wicd-curses" ]; then
+        if [ ! -f "$HOME/.wicd/CLIENT_CURSES_WARNING" ]; then
+            printf "NOTICE: You do not have an X server active on this console, \n"
+            printf "so ${BOLD}${BLUE}wicd-curses${NC} will be started instead. \n"
+            printf "Please see the wicd-client and/or wicd-curses manual pages \n"
+            printf "for more information about this error and resulting message. \n"
+            printf "\n" 
+            printf "This message will not be displayed again. \n"
+            printf "Press enter to continue... \n"
 
-        read _junk
-        cat >> "$HOME/.wicd/CLIENT_CURSES_WARNING" << EOF 
+            read _junk
+            cat >> "$HOME/.wicd/CLIENT_CURSES_WARNING" << EOF 
 The wicd-client script checks for the existence of this file to determine
 whether it should warn the user before launching wicd-curses instead, in 
 the event of the gui client being launched outside of the X Window environment.
@@ -29,8 +30,16 @@ the event of the gui client being launched outside of the X Window environment.
 If you delete this file, then wicd-client will print the warning if it is 
 launched outside of X (and then recreate this file again).
 EOF
-    fi
-    exec %BIN%wicd-curses
-fi
+        fi
+        exec %BIN%wicd-curses
+    
+    else
+        printf "NOTICE: You do not have an X server active on this console, \n"
+        printf "but you do not appear to have ${BOLD}${BLUE}wicd-curses${NC}\n"
+        printf "installed on this system.  We'd normally be running it here.\n"
+        printf "Please see the wicd-client manual page for more information.\n"
 
-exec python -O %LIB%wicd-client.py $@
+    fi
+else
+    exec python -O %LIB%wicd-client.py $@
+fi