1 files changed, 18 insertions, 9 deletions

diff --git a/scene/gui/menu_bar.cpp b/scene/gui/menu_bar.cpp
index 9eba2feaf7..8aad14e1ec 100644
--- a/scene/gui/menu_bar.cpp
+++ b/scene/gui/menu_bar.cpp
@@ -60,7 +60,7 @@ void MenuBar::gui_input(const Ref<InputEvent> &p_event) {
 			if (active_menu >= 0) {
 				get_menu_popup(active_menu)->hide();
 			}
-			_open_popup(selected_menu);
+			_open_popup(selected_menu, true);
 		}
 		return;
 	} else if (p_event->is_action("ui_right") && p_event->is_pressed()) {
@@ -82,7 +82,7 @@ void MenuBar::gui_input(const Ref<InputEvent> &p_event) {
 			if (active_menu >= 0) {
 				get_menu_popup(active_menu)->hide();
 			}
-			_open_popup(selected_menu);
+			_open_popup(selected_menu, true);
 		}
 		return;
 	}
@@ -95,7 +95,7 @@ void MenuBar::gui_input(const Ref<InputEvent> &p_event) {
 			selected_menu = focused_menu;
 		}
 		if (selected_menu != old_sel) {
-			update();
+			queue_redraw();
 		}
 	}
 
@@ -110,7 +110,7 @@ void MenuBar::gui_input(const Ref<InputEvent> &p_event) {
 	}
 }
 
-void MenuBar::_open_popup(int p_index) {
+void MenuBar::_open_popup(int p_index, bool p_focus_item) {
 	ERR_FAIL_INDEX(p_index, menu_cache.size());
 
 	PopupMenu *pm = get_menu_popup(p_index);
@@ -134,7 +134,16 @@ void MenuBar::_open_popup(int p_index) {
 	pm->set_parent_rect(Rect2(Point2(screen_pos - pm->get_position()), Size2(screen_size.x, screen_pos.y)));
 	pm->popup();
 
-	update();
+	if (p_focus_item) {
+		for (int i = 0; i < pm->get_item_count(); i++) {
+			if (!pm->is_item_disabled(i)) {
+				pm->set_current_index(i);
+				break;
+			}
+		}
+	}
+
+	queue_redraw();
 }
 
 void MenuBar::shortcut_input(const Ref<InputEvent> &p_event) {
@@ -203,7 +212,7 @@ void MenuBar::_popup_visibility_changed(bool p_visible) {
 		active_menu = -1;
 		focused_menu = -1;
 		set_process_internal(false);
-		update();
+		queue_redraw();
 		return;
 	}
 
@@ -328,7 +337,7 @@ void MenuBar::_update_menu() {
 		}
 	}
 	update_minimum_size();
-	update();
+	queue_redraw();
 }
 
 void MenuBar::_notification(int p_what) {
@@ -343,7 +352,7 @@ void MenuBar::_notification(int p_what) {
 		} break;
 		case NOTIFICATION_MOUSE_EXIT: {
 			focused_menu = -1;
-			update();
+			queue_redraw();
 		} break;
 		case NOTIFICATION_TRANSLATION_CHANGED:
 		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
@@ -707,7 +716,7 @@ String MenuBar::get_language() const {
 void MenuBar::set_flat(bool p_enabled) {
 	if (flat != p_enabled) {
 		flat = p_enabled;
-		update();
+		queue_redraw();
 	}
 }