diff --git a/app/browser/menu.js b/app/browser/menu.js
index 8d6b175de57..4101c0e060d 100644
--- a/app/browser/menu.js
+++ b/app/browser/menu.js
@@ -364,7 +364,7 @@ const createHistorySubmenu = (CommonMenu) => {
 }
 
 const createBookmarksSubmenu = (CommonMenu) => {
-  return [
+  let submenu = [
     {
       label: locale.translation('bookmarkPage'),
       type: 'checkbox',
@@ -386,9 +386,16 @@ const createBookmarksSubmenu = (CommonMenu) => {
     CommonMenu.bookmarksManagerMenuItem(),
     CommonMenu.bookmarksToolbarMenuItem(),
     CommonMenu.separatorMenuItem,
-    CommonMenu.importBookmarksMenuItem(),
-    CommonMenu.separatorMenuItem
-  ].concat(menuUtil.createBookmarkMenuItems())
+    CommonMenu.importBookmarksMenuItem()
+  ]
+
+  const bookmarks = menuUtil.createBookmarkMenuItems()
+  if (bookmarks.length > 0) {
+    submenu.push(CommonMenu.separatorMenuItem)
+    submenu = submenu.concat(bookmarks)
+  }
+
+  return submenu
 }
 
 const createWindowSubmenu = (CommonMenu) => {
diff --git a/js/contextMenus.js b/js/contextMenus.js
index 01415effc16..be0e4fc5de7 100644
--- a/js/contextMenus.js
+++ b/js/contextMenus.js
@@ -870,7 +870,11 @@ function mainTemplateInit (nodeProps, frame) {
       label: locale.translation('redo'),
       accelerator: 'Shift+CmdOrCtrl+Z',
       role: 'redo'
-    }, CommonMenu.separatorMenuItem, ...editableItems, CommonMenu.separatorMenuItem)
+    }, CommonMenu.separatorMenuItem)
+
+    if (editableItems.length > 0) {
+      template.push(...editableItems, CommonMenu.separatorMenuItem)
+    }
   } else if (isTextSelected) {
     if (isDarwin) {
       template.push(showDefinitionMenuItem(nodeProps.selectionText),