diff --git a/calmwm.h b/calmwm.h
index 1343011..7c7f53b 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -321,7 +321,6 @@ void			 client_send_delete(struct client_ctx *);
 struct client_ctx	*client_current(void);
 void			 client_hide(struct client_ctx *);
 void			 client_unhide(struct client_ctx *);
-void			 client_nocurrent(void);
 void			 client_setname(struct client_ctx *);
 void			 client_warp(struct client_ctx *);
 void			 client_ptrwarp(struct client_ctx *);
diff --git a/xevents.c b/xevents.c
index 8db5862..ee251dc 100644
--- a/xevents.c
+++ b/xevents.c
@@ -192,17 +192,7 @@ xev_handle_enternotify(struct xevent *xev, XEvent *ee)
 	XCrossingEvent		*e = &ee->xcrossing;
 	struct client_ctx	*cc;
 
-	if ((cc = client_find(e->window)) == NULL) {
-		/*
-		 * XXX - later.  messes up unclutter.  but may be
-		 * needed when we introduce menu windows and such into
-		 * the main event loop.
-		 */
-#ifdef notyet
-		if (e->window != e->root)
-			client_nocurrent();
-#endif
-	} else
+	if ((cc = client_find(e->window)) != NULL)
 		client_setactive(cc, 1);
 
 	xev_register(xev);