diff --git a/milkwm/xserver.c b/milkwm/xserver.c
index 36830e4..753ba2e 100644
--- a/milkwm/xserver.c
+++ b/milkwm/xserver.c
@@ -410,7 +410,13 @@ void loop_x(void) {
 				}
 			}
 
-			if(w != None) XRaiseWindow(xdisplay, w);
+			if(w == None) {
+				XRaiseWindow(xdisplay, t);
+
+				set_focus(t);
+			} else {
+				XRaiseWindow(xdisplay, w);
+			}
 
 			XAllowEvents(xdisplay, ReplayPointer, CurrentTime);
 		} else if(ev.type == MotionNotify && ev.xmotion.subwindow != None) {
@@ -522,6 +528,8 @@ void loop_x(void) {
 				arrput(windows, w);
 
 				XMapWindow(xdisplay, ev.xmaprequest.window);
+
+				if(!xwa.override_redirect) save(ev.xmaprequest.window);
 				continue;
 			}
 
diff --git a/mpanel/mpanelrc.in b/mpanel/mpanelrc.in
index 70e81b1..34fa1c1 100644
--- a/mpanel/mpanelrc.in
+++ b/mpanel/mpanelrc.in
@@ -9,6 +9,7 @@
 				<Application Name="Applications" />
 				<Separator />
 				<Execute Name="Terminal">xterm</Execute>
+				<Execute Name=""></Execute>
 			</Menu>
 		</StartButton>