diff --git a/src/match.c b/src/match.c
index d2942f77e..d4439e759 100644
--- a/src/match.c
+++ b/src/match.c
@@ -181,6 +181,6 @@ e_match_save_props(E_Border *b)
      }
    
    e_db_close(db);
-   e_db_flush();
+   e_db_runtime_flush();
    D_RETURN;
 }
diff --git a/src/menu.c b/src/menu.c
index f75fb4286..bd097a3a7 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -932,6 +932,19 @@ e_menu_event_win_show(void)
      }
    /* raise it */
    if (menu_event_win) ecore_window_raise(menu_event_win);
+   if ((!ecore_grab_window_get()) || (!ecore_keyboard_grab_window_get()))
+     {
+	Evas_List l;
+	
+	for (l = menus; l; l = l->next)
+	  {
+	     E_Menu *m;
+	     
+	     m = l->data;	     
+	     if (m->current.visible) e_menu_hide(m);
+	  }
+	e_menu_event_win_hide();
+     }
 
    D_RETURN;
 }