diff --git a/src/client.c b/src/client.c
index 6b9f356..0c6f273 100644
--- a/src/client.c
+++ b/src/client.c
@@ -143,7 +143,7 @@ uicb_client_swap_next(uicb_t cmd)
 {
      Client *c = NULL;
 
-     if(!sel && !sel->tile)
+     if(!sel || !sel->tile)
           return;
 
      /* Find the next client */
@@ -168,7 +168,7 @@ uicb_client_swap_prev(uicb_t cmd)
 {
      Client *c = NULL, *d;
 
-     if(!sel && !sel->tile)
+     if(!sel || !sel->tile)
           return;
 
      /* Find the previous client */
diff --git a/wmfsrc.in b/wmfsrc.in
index b39f8f8..f4c6a55 100644
--- a/wmfsrc.in
+++ b/wmfsrc.in
@@ -92,7 +92,6 @@ client
         modifier              = "Alt"
         mouse { button = "1" func = "client_raise" }
         mouse { button = "1" func = "mouse_move" }
-        mouse { button = "2" func = "tile_switch" }
         mouse { button = "3" func = "client_raise" }
         mouse { button = "3" func = "mouse_resize" }
 
@@ -106,7 +105,6 @@ client
 
                 mouse { button = "1" func = "client_raise" }
                 mouse { button = "1" func = "mouse_move" }
-                mouse { button = "2" func = "tile_switch" }
                 mouse { button = "3" func = "client_raise" }
                 mouse { button = "3" func = "mouse_resize" }