diff --git a/src/actions.c b/src/actions.c
index 5adfab49..b210888d 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -225,6 +225,7 @@ void wSetFocusTo(WScreen *scr, WWindow *wwin)
 		wUserMenuRefreshInstances(napp->menu, wwin);
 #endif	/* USER_MENU */
 
+		/* kix: Only menu map with mouse, not alt+tab! */
 		if (wwin->flags.mapped)
 			wAppMenuMap(napp->menu, wwin);
 	}
diff --git a/src/application.c b/src/application.c
index c43df043..6ff3d3fc 100644
--- a/src/application.c
+++ b/src/application.c
@@ -129,6 +129,8 @@ WApplication *wApplicationCreate(WWindow * wwin)
 #ifdef USER_MENU
 	if (!wapp->menu)
 		wapp->menu = wUserMenuGet(scr, wapp->main_window_desc);
+
+	wAppMenuMap(wapp->menu, wwin);
 #endif
 
 	/* Set application wide attributes from the leader */