diff --git a/openbox/client.c b/openbox/client.c
index 930f3ee4..583f0615 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1228,7 +1228,7 @@ void client_setup_decor_and_functions(ObClient *self)
                    (self->mwmhints.decorations & OB_MWM_DECOR_TITLE)))
                 /* if the mwm hints request no handle or title, then all
                    decorations are disabled */
-                self->decorations = 0;
+                self->decorations = config_theme_keepborder ? OB_FRAME_DECOR_BORDER : 0;
         }
     }
 
diff --git a/openbox/menu.c b/openbox/menu.c
index d4e44418..a969da83 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -315,6 +315,8 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
     }
     if (!menu_frame_show(frame, NULL))
         menu_frame_free(frame);
+    else if (frame->entries)
+        menu_frame_select_next(frame);
 }
 
 static ObMenuEntry* menu_entry_new(ObMenu *menu, ObMenuEntryType type, gint id)