diff --git a/src/ChangeLog b/src/ChangeLog
index 5ebb73293..27cec3449 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-08  Oskar Liljeblad  <oskar@osk.mine.nu>
+
+	* key.c (get_event): Check gpm_fd only if gpm is actually used.
+	* layout.c (done_screen): Move disable_mouse() call ...
+	* main.c (done_mc): ... here.
+
 2002-09-08  Pavel Roskin  <proski@gnu.org>
 
 	* view.c (init_growing_view): Avoid reporting the same error
diff --git a/src/key.c b/src/key.c
index 7a10abf4e..1499dfb81 100644
--- a/src/key.c
+++ b/src/key.c
@@ -714,13 +714,13 @@ get_event (Gpm_Event * event, int redo_event, int block)
 	maxfdp = max (add_selects (&select_set), input_fd);
 
 #ifdef HAVE_LIBGPM
-	if (gpm_fd == -1) {
-	    /* Connection to gpm broken, possibly gpm has died */
-	    mouse_enabled = 0;
-	    use_mouse_p = MOUSE_NONE;
-	    break;
-	}
 	if (use_mouse_p == MOUSE_GPM) {
+	    if (gpm_fd == -1) {
+		/* Connection to gpm broken, possibly gpm has died */
+		mouse_enabled = 0;
+		use_mouse_p = MOUSE_NONE;
+		break;
+	    }
 	    FD_SET (gpm_fd, &select_set);
 	    maxfdp = max (maxfdp, gpm_fd);
 	}
diff --git a/src/layout.c b/src/layout.c
index e45951684..1a4df1e2b 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -615,7 +615,6 @@ void done_screen ()
 	clr_scr ();                                                             
     reset_shell_mode ();                                                        
     mc_noraw_mode ();                                                           
-    disable_mouse ();                                                          
     keypad (stdscr, FALSE);                                                     
 }                                                                               
 
diff --git a/src/main.c b/src/main.c
index 82872b67f..7466af890 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1621,6 +1621,8 @@ static void setup_dummy_mc (const char *file)
 
 static void done_mc (void)
 {
+    disable_mouse ();
+
     done_menu ();
     
     /* Setup shutdown