diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 42537e0ef39cf..5f6b1f0ab09c9 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -894,7 +894,6 @@ void NativeWindowViews::SetMenu(AtomMenuModel* menu_model) {
   if (menu_model == nullptr) {
     global_menu_bar_.reset();
     root_view_->UnregisterAcceleratorsWithFocusManager();
-    return;
   }
 
   if (!global_menu_bar_ && ShouldUseGlobalMenuBar())
diff --git a/atom/browser/ui/views/root_view.cc b/atom/browser/ui/views/root_view.cc
index b7aedfbb9034a..d9bafcf7b2d48 100644
--- a/atom/browser/ui/views/root_view.cc
+++ b/atom/browser/ui/views/root_view.cc
@@ -178,9 +178,10 @@ bool RootView::AcceleratorPressed(const ui::Accelerator& accelerator) {
 }
 
 void RootView::RegisterAcceleratorsWithFocusManager(AtomMenuModel* menu_model) {
+  if (!menu_model)
+    return;
   // Clear previous accelerators.
   UnregisterAcceleratorsWithFocusManager();
-
   views::FocusManager* focus_manager = GetFocusManager();
   // Register accelerators with focus manager.
   accelerator_util::GenerateAcceleratorTable(&accelerator_table_, menu_model);