diff --git a/src/browser/application-menu.coffee b/src/browser/application-menu.coffee
index e6d744241..9be3f6024 100644
--- a/src/browser/application-menu.coffee
+++ b/src/browser/application-menu.coffee
@@ -124,7 +124,7 @@ class ApplicationMenu
     exitItem.visible = fullscreen
 
   showDevModeItem: ->
-    devModeItem = _.find(@flattenMenuItems(@menu), ({label}) -> label == 'Run with Debug Flags')
+    devModeItem = _.find(@flattenMenuItems(@menu), ({command}) -> command is 'application:toggle-dev')
     devModeItem?.checked = global.application.devMode
 
   # Default list of menu items.
diff --git a/src/sheet-toolbar.cjsx b/src/sheet-toolbar.cjsx
index e2acddf6b..6cf0ec73d 100644
--- a/src/sheet-toolbar.cjsx
+++ b/src/sheet-toolbar.cjsx
@@ -112,9 +112,7 @@ class ToolbarMenuControl extends React.Component
 
   _openMenu: =>
     applicationMenu = require('remote').getGlobal('application').applicationMenu
-    activeTemplate = Utils.deepClone(applicationMenu.activeTemplate)
-    menu = require('remote').require('menu').buildFromTemplate(activeTemplate)
-    menu.popup(NylasEnv.getCurrentWindow())
+    applicationMenu.menu.popup(NylasEnv.getCurrentWindow())
 
 ComponentRegistry.register ToolbarWindowControls,
   location: WorkspaceStore.Sheet.Global.Toolbar.Left