diff --git a/app/lib/menu/menu-builder.js b/app/lib/menu/menu-builder.js
index b0297fe370..ddd64739e8 100644
--- a/app/lib/menu/menu-builder.js
+++ b/app/lib/menu/menu-builder.js
@@ -243,594 +243,64 @@ MenuBuilder.prototype.appendQuit = function(submenu) {
   return this;
 };
 
-MenuBuilder.prototype.appendRedo = function() {
-  this.menu.append(new MenuItem({
-    label: 'Redo',
-    enabled: this.opts.state.redo,
-    accelerator: 'CommandOrControl+Y',
-    click: function() {
-      app.emit('menu:action', 'redo');
-    }
-  }));
-};
-
-MenuBuilder.prototype.appendCopyPaste = function() {
-
-  var copyEntry = {
-    label: 'Copy',
-    enabled: !this.opts.state.inactiveInput || (this.opts.state.elementsSelected && this.opts.state.copy),
-    accelerator: 'CommandOrControl+C',
-    click: function() {
-      app.emit('menu:action', 'copy');
-    }
-  };
-
-  var pasteEntry = {
-    label: 'Paste',
-    enabled: !this.opts.state.inactiveInput || this.opts.state.paste,
-    accelerator: 'CommandOrControl+V',
-    click: function() {
-      app.emit('menu:action', 'paste');
-    }
-  };
-
-  if (!this.opts.state.inactiveInput) {
-    assign(copyEntry, { enabled: true, click: function() {}, role: 'copy' });
-
-    assign(pasteEntry, { enabled: true, click: function() {}, role: 'paste' });
-
-    this.menu.append(new MenuItem({
-      label: 'Cut',
-      accelerator: 'CommandOrControl+X',
-      role: 'cut'
-    }));
-  }
-
-  this.menu.append(new MenuItem(copyEntry));
+MenuBuilder.prototype.appendMenuItem = function(builder, menuItem) {
+  var submenu;
 
-  this.menu.append(new MenuItem(pasteEntry));
-
-  return this;
-};
-
-MenuBuilder.prototype.appendBaseEditActions = function() {
-  this.menu.append(new MenuItem({
-    label: 'Undo',
-    enabled: this.opts.state.undo,
-    accelerator: 'CommandOrControl+Z',
-    click: function() {
-      app.emit('menu:action', 'undo');
-    }
-  }));
-
-  this.appendRedo();
-
-  this.appendSeparator();
-
-  if (this.opts.state.copy) {
-    this.appendCopyPaste();
-  }
-
-  return this;
-};
-
-MenuBuilder.prototype.appendBpmnActions = function() {
-
-  this.menu.append(new MenuItem({
-    label: 'Hand Tool',
-    accelerator: 'H',
-    enabled: this.opts.state.inactiveInput,
-    click: function() {
-      app.emit('menu:action', 'handTool');
-    }
-  }));
-
-  this.menu.append(new MenuItem({
-    label: 'Lasso Tool',
-    accelerator: 'L',
-    enabled: this.opts.state.inactiveInput,
-    click: function() {
-      app.emit('menu:action', 'lassoTool');
-    }
-  }));
-
-  this.menu.append(new MenuItem({
-    label: 'Space Tool',
-    accelerator: 'S',
-    enabled: this.opts.state.inactiveInput,
-    click: function() {
-      app.emit('menu:action', 'spaceTool');
-    }
-  }));
-
-  this.menu.append(new MenuItem({
-    label: 'Global Connect Tool',
-    accelerator: 'C',
-    enabled: this.opts.state.inactiveInput,
-    click: function() {
-      app.emit('menu:action', 'globalConnectTool');
-    }
-  }));
-
-  this.menu.append(new MenuItem({
-    label: 'Edit Label',
-    accelerator: 'E',
-    enabled: this.opts.state.elementsSelected && this.opts.state.inactiveInput,
-    click: function() {
-      app.emit('menu:action', 'directEditing');
-    }
-  }));
-
-  this.appendSeparator();
-
-  this.menu.append(new MenuItem({
-    label: 'Align Elements',
-    enabled: this.opts.state.elementsSelected && this.opts.inactiveInput,
-    submenu: Menu.buildFromTemplate([
-      {
-        label: 'Align Left',
+  if (menuItem.submenu) {
+    submenu = Menu.buildFromTemplate(menuItem.submenu.map(submenuEntry => {
+      return assign(submenuEntry, {
         click: function() {
-          app.emit('menu:action', 'alignElements', {
-            type: 'left'
-          });
+          app.emit('menu:action', submenuEntry.action, submenuEntry.options);
         }
-      }, {
-        label: 'Align Right',
-        click: function() {
-          app.emit('menu:action', 'alignElements', {
-            type: 'right'
-          });
-        }
-      }, {
-        label: 'Align Center',
-        click: function() {
-          app.emit('menu:action', 'alignElements', {
-            type: 'center'
-          });
-        }
-      }, {
-        label: 'Align Top',
-        click: function() {
-          app.emit('menu:action', 'alignElements', {
-            type: 'top'
-          });
-        }
-      }, {
-        label: 'Align Bottom',
-        click: function() {
-          app.emit('menu:action', 'alignElements', {
-            type: 'bottom'
-          });
-        }
-      }, {
-        label: 'Align Middle',
-        click: function() {
-          app.emit('menu:action', 'alignElements', {
-            type: 'middle'
-          });
-        }
-      }
-    ])
-  }));
-
-  this.menu.append(new MenuItem({
-    label: 'Distribute Elements',
-    enabled: this.opts.state.elementsSelected && this.opts.inactiveInput,
-    submenu: Menu.buildFromTemplate([
-      {
-        label: 'Distribute Horizontally',
-        enabled: this.opts.state.elementsSelected,
-        click: function() {
-          app.emit('menu:action', 'distributeHorizontally');
-        }
-      },
-      {
-        label: 'Distribute Vertically',
-        enabled: this.opts.state.elementsSelected,
-        click: function() {
-          app.emit('menu:action', 'distributeVertically');
-        }
-      }
-    ])
-  }));
-
-  this.appendSeparator();
-
-  this.menu.append(new MenuItem({
-    label: 'Find',
-    accelerator: 'CommandOrControl + F',
-    enabled: this.opts.state.inactiveInput,
-    click: function() {
-      app.emit('menu:action', 'find');
-    }
-  }));
-
-  this.appendSeparator();
+      });
+    }));
+  }
 
-  this.menu.append(new MenuItem({
-    label: 'Move Elements to Origin',
-    accelerator: 'CommandOrControl+Shift+0',
-    enabled: this.opts.state.inactiveInput,
+  builder.menu.append(new MenuItem({
+    label: menuItem.label,
+    accelerator: menuItem.accelerator,
+    enabled: menuItem.enabled !== undefined ? menuItem.enabled : true,
     click: function() {
-      app.emit('menu:action', 'moveToOrigin');
-    }
-  }));
-
-  this.menu.append(new MenuItem({
-    label: 'Move Canvas',
-    enabled: this.opts.state.inactiveInput,
-    submenu: Menu.buildFromTemplate([{
-      label: 'Move Up',
-      accelerator: 'Up',
-      click: function() {
-        app.emit('menu:action', 'moveCanvas', {
-          direction: 'up'
-        });
-      }
-    }, {
-      label: 'Move Left',
-      accelerator: 'Left',
-      click: function() {
-        app.emit('menu:action', 'moveCanvas', {
-          direction: 'left'
-        });
-      }
-    }, {
-      label: 'Move Down',
-      accelerator: 'Down',
-      click: function() {
-        app.emit('menu:action', 'moveCanvas', {
-          direction: 'down'
-        });
-      }
-    }, {
-      label: 'Move Right',
-      accelerator: 'Right',
-      click: function() {
-        app.emit('menu:action', 'moveCanvas', {
-          direction: 'right'
-        });
-      }
-    }])
+      app.emit('menu:action', menuItem.action, menuItem.options);
+    },
+    submenu: submenu
   }));
-
-  this.appendSelectAll();
-
-  this.appendRemoveSelection();
-
-  return this;
 };
 
+MenuBuilder.prototype.getEditMenu = function(menuItems) {
+  var builder = new this.constructor(this.opts);
 
-MenuBuilder.prototype.appendCmmnActions = function() {
-  this.menu.append(new MenuItem({
-    label: 'Hand Tool',
-    accelerator: 'H',
-    enabled: this.opts.state.inactiveInput,
-    click: function() {
-      app.emit('menu:action', 'handTool');
-    }
-  }));
-
-  this.menu.append(new MenuItem({
-    label: 'Lasso Tool',
-    accelerator: 'L',
-    enabled: this.opts.state.inactiveInput,
-    click: function() {
-      app.emit('menu:action', 'lassoTool');
-    }
-  }));
-
-  this.menu.append(new MenuItem({
-    label: 'Space Tool',
-    accelerator: 'S',
-    enabled: this.opts.state.inactiveInput,
-    click: function() {
-      app.emit('menu:action', 'spaceTool');
-    }
-  }));
-
-  this.menu.append(new MenuItem({
-    label: 'Global Connect Tool',
-    accelerator: 'C',
-    enabled: this.opts.state.inactiveInput,
-    click: function() {
-      app.emit('menu:action', 'globalConnectTool');
-    }
-  }));
-
-  this.menu.append(new MenuItem({
-    label: 'Edit Label',
-    accelerator: 'E',
-    enabled: this.opts.state.elementsSelected && this.opts.state.inactiveInput,
-    click: function() {
-      app.emit('menu:action', 'directEditing');
-    }
-  }));
-
-  this.appendSeparator();
+  menuItems.forEach((menuItem, index) => {
 
-  this.menu.append(new MenuItem({
-    label: 'Find',
-    accelerator: 'CommandOrControl + F',
-    enabled: this.opts.state.inactiveInput,
-    click: function() {
-      app.emit('menu:action', 'find');
-    }
-  }));
-
-  this.appendSeparator();
-
-  this.menu.append(new MenuItem({
-    label: 'Move Canvas',
-    enabled: this.opts.state.inactiveInput,
-    submenu: Menu.buildFromTemplate([{
-      label: 'Move Up',
-      accelerator: 'Up',
-      click: function() {
-        app.emit('menu:action', 'moveCanvas', {
-          direction: 'up'
-        });
-      }
-    }, {
-      label: 'Move Left',
-      accelerator: 'Left',
-      click: function() {
-        app.emit('menu:action', 'moveCanvas', {
-          direction: 'left'
-        });
-      }
-    }, {
-      label: 'Move Down',
-      accelerator: 'Down',
-      click: function() {
-        app.emit('menu:action', 'moveCanvas', {
-          direction: 'down'
-        });
+    if (Array.isArray(menuItem)) {
+      if (index !== 0) {
+        builder.appendSeparator();
       }
-    }, {
-      label: 'Move Right',
-      accelerator: 'Right',
-      click: function() {
-        app.emit('menu:action', 'moveCanvas', {
-          direction: 'right'
-        });
-      }
-    }])
-  }));
-
-  this.appendSelectAll();
-
-  this.appendRemoveSelection();
 
-  return this;
-};
-
-MenuBuilder.prototype.appendRemoveSelection = function() {
-  this.menu.append(new MenuItem({
-    label: 'Remove Selected',
-    accelerator: 'Delete',
-    enabled: this.opts.state.elementsSelected,
-    click: function() {
-      app.emit('menu:action', 'removeSelection');
-    }
-  }));
-};
-
-
-MenuBuilder.prototype.appendSelectAll = function() {
-  var selectAll = {
-    label: 'Select All',
-    accelerator: 'CommandOrControl+A',
-    click: function() {
-      app.emit('menu:action', 'selectElements');
+      menuItem.forEach((menuItem) => {
+        this.appendMenuItem(builder, menuItem);
+      });
+    } else {
+      this.appendMenuItem(builder, menuItem);
     }
-  };
 
-  if (!this.opts.state.inactiveInput) {
-    assign(selectAll, { enabled: true, click: function() {}, role: 'selectall' });
-  }
-
-  this.menu.append(new MenuItem(selectAll));
+  });
 
-  return this;
+  return builder.get();
 };
 
+MenuBuilder.prototype.appendEditMenu = function() {
+  var subMenu;
 
-MenuBuilder.prototype.appendDmnActions = function() {
-  var activeEditor = this.opts.state.activeEditor;
-
-  if (activeEditor === 'drd') {
-
-    // DRD editor
-    this.menu.append(new MenuItem({
-      label: 'Lasso Tool',
-      accelerator: 'L',
-      enabled: this.opts.state.inactiveInput,
-      click: function() {
-        app.emit('menu:action', 'lassoTool');
-      }
-    }));
-
-    this.menu.append(new MenuItem({
-      label: 'Edit Label',
-      accelerator: 'E',
-      enabled: this.opts.state.elementsSelected && this.opts.state.inactiveInput,
-      click: function() {
-        app.emit('menu:action', 'directEditing');
-      }
-    }));
-
-    this.appendSeparator();
-
-    this.appendSelectAll();
-
-    this.appendRemoveSelection();
-
-  } else if (activeEditor === 'decisionTable') {
-
-    // decision table editor
-    this.menu.append(new MenuItem({
-      label: 'Add Rule..',
-      submenu: Menu.buildFromTemplate([{
-        label: 'At End',
-        accelerator: 'CommandOrControl+D',
-        click: function() {
-          app.emit('menu:action', 'addRule');
-        }
-      }, {
-        label: 'Above Selected',
-        enabled: this.opts.state.dmnRuleEditing,
-        click: function() {
-          app.emit('menu:action', 'addRuleAbove');
-        }
-      }, {
-        label: 'Below Selected',
-        enabled: this.opts.state.dmnRuleEditing,
-        click: function() {
-          app.emit('menu:action', 'addRuleBelow');
-        }
-      }])
-    }));
-
-    this.menu.append(new MenuItem({
-      label: 'Remove Rule',
-      enabled: this.opts.state.dmnRuleEditing,
-      click: function() {
-        app.emit('menu:action', 'removeRule');
-      }
-    }));
-
-    this.appendSeparator();
-
-    this.menu.append(new MenuItem({
-      label: 'Add Clause..',
-      submenu: Menu.buildFromTemplate([{
-        label: 'Input',
-        click: function() {
-          app.emit('menu:action', 'addInput');
-        }
-      }, {
-        label: 'Output',
-        click: function() {
-          app.emit('menu:action', 'addOutput');
-        }
-      }, {
-        type: 'separator'
-      }, {
-        label: 'Left of selected',
-        enabled: this.opts.state.dmnClauseEditing,
-        click: function() {
-          app.emit('menu:action', 'addClauseLeft');
-        }
-      }, {
-        label: 'Right of selected',
-        enabled: this.opts.state.dmnClauseEditing,
-        click: function() {
-          app.emit('menu:action', 'addClauseRight');
-        }
-      }])
-    }));
-
-    this.menu.append(new MenuItem({
-      label: 'Remove Clause',
-      enabled: this.opts.state.dmnClauseEditing,
-      click: function() {
-        app.emit('menu:action', 'removeClause');
-      }
-    }));
-
-    this.appendSeparator();
-
-    this.menu.append(new MenuItem({
-      label: 'Select Cell Above',
-      enabled: this.opts.state.dmnClauseEditing,
-      click: function() {
-        app.emit('menu:action', 'selectCellAbove');
-      }
-    }));
-
-    this.menu.append(new MenuItem({
-      label: 'Select Cell Below',
-      enabled: this.opts.state.dmnClauseEditing,
-      click: function() {
-        app.emit('menu:action', 'selectCellBelow');
-      }
-    }));
+  if (this.opts.state.editMenu) {
+    subMenu = this.getEditMenu(this.opts.state.editMenu, this.opts);
   }
 
-  return this;
-};
-
-
-MenuBuilder.prototype.appendSearchActions = function() {
   this.menu.append(new MenuItem({
-    label: 'Find',
-    accelerator: 'CommandOrControl + F',
-    click: function() {
-      app.emit('menu:action', 'find');
-    }
-  }));
-
-  this.menu.append(new MenuItem({
-    label: 'Find Next',
-    accelerator: 'Shift + CommandOrControl + N',
-    click: function() {
-      app.emit('menu:action', 'findNext');
-    }
+    label: 'Edit',
+    submenu: subMenu
   }));
 
-  this.menu.append(new MenuItem({
-    label: 'Find Previous',
-    accelerator: 'Shift + CommandOrControl + P',
-    click: function() {
-      app.emit('menu:action', 'findPrev');
-    }
-  }));
-
-  this.menu.append(new MenuItem({
-    label: 'Replace',
-    accelerator: 'Shift + CommandOrControl + F',
-    click: function() {
-      app.emit('menu:action', 'replace');
-    }
-  }));
-};
-
-MenuBuilder.prototype.appendEditMenu = function() {
-  if (this.opts.state.editable) {
-    var builder = new this.constructor(this.opts).appendBaseEditActions();
-
-    if (this.opts.state.bpmn) {
-      builder.appendSeparator();
-
-      builder.appendBpmnActions();
-    }
-
-    if (this.opts.state.dmn) {
-      builder.appendDmnActions();
-    }
-
-    if (this.opts.state.cmmn) {
-      builder.appendSeparator();
-
-      builder.appendCmmnActions();
-    }
-
-    if (this.opts.state.searchable) {
-      builder.appendSeparator();
-
-      builder.appendSearchActions();
-    }
-
-    this.menu.append(new MenuItem({
-      label: 'Edit',
-      submenu: builder.get()
-    }));
-  }
-
-
-
   return this;
 };
 
diff --git a/client/src/app/App.js b/client/src/app/App.js
index 85e81cb274..e7f5a4a127 100644
--- a/client/src/app/App.js
+++ b/client/src/app/App.js
@@ -362,13 +362,16 @@ export class App extends Component {
       });
     }
 
+    tabState = {
+      ...tabState,
+      ...properties
+    };
 
     this.setState({
-      tabState: {
-        ...tabState,
-        ...properties
-      }
+      tabState
     });
+
+    this.updateMenu(tabState);
   }
 
   tabSaved(tab, newFile) {
@@ -438,20 +441,11 @@ export class App extends Component {
 
     const {
       onTabChanged,
-      onTabShown,
-      onToolStateChanged
+      onTabShown
     } = this.props;
 
     if (prevState.activeTab !== activeTab) {
 
-      if (typeof onToolStateChanged === 'function') {
-        onToolStateChanged(activeTab, {
-          closable: activeTab !== EMPTY_TAB,
-          save: activeTab !== EMPTY_TAB,
-          dirty: this.isDirty(activeTab)
-        });
-      }
-
       if (typeof onTabChanged === 'function') {
         onTabChanged(activeTab, prevState.activeTab);
       }
@@ -542,6 +536,11 @@ export class App extends Component {
     console.error('NOT IMPLEMENTED');
   }
 
+  updateMenu = (state) => {
+    console.log('App#updateMenu');
+    this.props.globals.backend.updateMenu(state);
+  }
+
   triggerAction = (action, options) => {
 
     const {
@@ -627,6 +626,10 @@ export class App extends Component {
       return this.showShortcuts();
     }
 
+    if (action === 'update-menu') {
+      return this.updateMenu();
+    }
+
     const tab = this.tabRef.current;
 
     return tab.triggerAction(action, options);
diff --git a/client/src/app/AppParent.js b/client/src/app/AppParent.js
index c74bd6abdb..0d49f84c9e 100644
--- a/client/src/app/AppParent.js
+++ b/client/src/app/AppParent.js
@@ -47,10 +47,6 @@ export default class AppParent extends Component {
     this.getBackend().showContextMenu(type, options);
   }
 
-  handleToolStateChanged = (tab, state) => {
-    this.getBackend().updateMenu(state);
-  }
-
   handleReady = () => {
 
     this.getBackend().sendReady();
@@ -114,7 +110,6 @@ export default class AppParent extends Component {
         ref={ this.appRef }
         tabsProvider={ tabsProvider }
         globals={ globals }
-        onToolStateChanged={ this.handleToolStateChanged }
         onContextMenu={ this.handleContextMenu }
         onReady={ this.handleReady }
       />
diff --git a/client/src/app/__tests__/AppSpec.js b/client/src/app/__tests__/AppSpec.js
index bee5a14ca0..f192715d89 100644
--- a/client/src/app/__tests__/AppSpec.js
+++ b/client/src/app/__tests__/AppSpec.js
@@ -27,8 +27,6 @@ describe('<App>', function() {
 
     it('tabsProvider');
 
-    it('onToolStateChanged');
-
     it('onReady');
 
     it('onContextMenu');
@@ -588,7 +586,6 @@ function createApp(options = {}, mountFn=shallow) {
   };
 
   const onTabShown = options.onTabShown;
-  const onToolStateChanged = options.onToolStateChanged;
   const onReady = options.onReady;
 
   const tree = mountFn(
@@ -599,7 +596,6 @@ function createApp(options = {}, mountFn=shallow) {
       onReady={ onReady }
       onTabChanged={ onTabChanged }
       onTabShown={ onTabShown }
-      onToolStateChanged={ onToolStateChanged }
     />
   );
 
diff --git a/client/src/app/tabs/bpmn/BpmnEditor.js b/client/src/app/tabs/bpmn/BpmnEditor.js
index 962bdbf9d4..7a20baadf2 100644
--- a/client/src/app/tabs/bpmn/BpmnEditor.js
+++ b/client/src/app/tabs/bpmn/BpmnEditor.js
@@ -17,6 +17,9 @@ import {
 
 import CamundaBpmnModeler from './modeler';
 
+import { active as isInputActive } from '../../../util/dom/is-input';
+
+import { getBpmnEditMenu } from './getBpmnEditMenu';
 
 import css from './BpmnEditor.less';
 
@@ -177,22 +180,46 @@ export class BpmnEditor extends CachedComponent {
       onChanged
     } = this.props;
 
-    // TODO(nikku): complete state updating
     const commandStack = modeler.get('commandStack');
     const selection = modeler.get('selection');
+    const canPaste = !modeler.get('clipboard').isEmpty();
 
     const selectionLength = selection.get().length;
 
+    const inputActive = isInputActive();
+
+    const editMenu = getBpmnEditMenu({
+      align: selectionLength > 1,
+      canCopy: !!selectionLength,
+      canPaste,
+      canRedo: commandStack.canRedo(),
+      canUndo: commandStack.canUndo(),
+      distribute: selectionLength > 2,
+      editLabel: !inputActive && !!selectionLength,
+      find: !inputActive,
+      globalConnectTool: !inputActive,
+      handTool: !inputActive,
+      lassoTool: !inputActive,
+      moveToOrigin: !inputActive,
+      spaceTool: !inputActive,
+      moveCanvas: !inputActive,
+      removeSelected: !!selectionLength
+    });
+
     const newState = {
-      undo: commandStack.canUndo(),
-      redo: commandStack.canRedo(),
       align: selectionLength > 1,
+      canExport: [ 'svg', 'png' ],
+      distribute: selectionLength > 2,
+      redo: commandStack.canRedo(),
       setColor: selectionLength,
-      canExport: [ 'svg', 'png' ]
+      undo: commandStack.canUndo()
     };
 
     if (typeof onChanged === 'function') {
-      onChanged(newState);
+      onChanged({
+        ...newState,
+        editMenu
+      });
     }
 
     this.setState(newState);
@@ -382,14 +409,14 @@ export class BpmnEditor extends CachedComponent {
         <Fill name="toolbar" group="distribute">
           <Button
             title="Distribute elements horizontally"
-            disabled={ !this.state.align }
+            disabled={ !this.state.distribute }
             onClick={ () => this.handleDistributeElements('horizontal') }
           >
             <Icon name="distribute-horizontal-tool" />
           </Button>
           <Button
             title="Distribute elements vertically"
-            disabled={ !this.state.align }
+            disabled={ !this.state.distribute }
             onClick={ () => this.handleDistributeElements('vertical') }
           >
             <Icon name="distribute-vertical-tool" />
diff --git a/client/src/app/tabs/bpmn/getBpmnEditMenu.js b/client/src/app/tabs/bpmn/getBpmnEditMenu.js
new file mode 100644
index 0000000000..a4c0f469a5
--- /dev/null
+++ b/client/src/app/tabs/bpmn/getBpmnEditMenu.js
@@ -0,0 +1,70 @@
+import {
+  getCanvasEntries,
+  getDiagramFindEntries,
+  getSelectionEntries,
+  getToolEntries,
+  getUndoRedoEntries
+} from '../getEditMenu';
+
+function getCopyPasteEntries({
+  canCopy,
+  canPaste
+}) {
+  return [{
+    label: 'Copy',
+    accelerator: 'CommandOrControl+C',
+    enabled: canCopy,
+    action: 'copy'
+  }, {
+    label: 'Paste',
+    accelerator: 'CommandOrControl+V',
+    enabled: canPaste,
+    action: 'paste'
+  }];
+}
+
+function getAlignDistributeEntries({
+  align,
+  distribute
+}) {
+  return [{
+    label: 'Align Elements',
+    enabled: align,
+    submenu: [ 'Left', 'Right', 'Center', 'Top', 'Bottom', 'Middle' ].map(direction => {
+      return {
+        label: `Align ${direction}`,
+        enabled: align,
+        action: 'alignElements',
+        options: {
+          type: direction.toLowerCase()
+        }
+      };
+    })
+  }, {
+    label: 'Distribute Elements',
+    enabled: distribute,
+    submenu: [{
+      label: 'Distribute Horizontally',
+      enabled: distribute,
+      action: 'distributeHorizontally'
+    }, {
+      label: 'Distribute Vertically',
+      enabled: distribute,
+      action: 'distributeVertically'
+    }]
+  }];
+}
+
+export function getBpmnEditMenu(state) {
+  return [
+    getUndoRedoEntries(state),
+    getCopyPasteEntries(state),
+    getToolEntries(state),
+    getAlignDistributeEntries(state),
+    getDiagramFindEntries(state),
+    [
+      ...getCanvasEntries(state),
+      ...getSelectionEntries(state)
+    ]
+  ];
+}
\ No newline at end of file
diff --git a/client/src/app/tabs/cmmn/CmmnEditor.js b/client/src/app/tabs/cmmn/CmmnEditor.js
index d34f2e5ffd..b7c6eca349 100644
--- a/client/src/app/tabs/cmmn/CmmnEditor.js
+++ b/client/src/app/tabs/cmmn/CmmnEditor.js
@@ -8,9 +8,12 @@ import {
 
 import CamundaCmmnModeler from './modeler';
 
-
 import css from './CmmnEditor.less';
 
+import { active as isInputActive } from '../../../util/dom/is-input';
+
+import { getCmmnEditMenu } from './getCmmnEditMenu';
+
 
 export class CmmnEditor extends CachedComponent {
 
@@ -122,17 +125,37 @@ export class CmmnEditor extends CachedComponent {
       onChanged
     } = this.props;
 
-    // TODO(nikku): complete state updating
     const commandStack = modeler.get('commandStack');
+    const selection = modeler.get('selection');
+
+    const selectionLength = selection.get().length;
+
+    const inputActive = isInputActive();
+
+    const editMenu = getCmmnEditMenu({
+      canRedo: commandStack.canRedo(),
+      canUndo: commandStack.canUndo(),
+      editLabel: !inputActive && !!selectionLength,
+      find: !inputActive,
+      globalConnectTool: !inputActive,
+      handTool: !inputActive,
+      lassoTool: !inputActive,
+      spaceTool: !inputActive,
+      moveCanvas: !inputActive,
+      removeSelected: !!selectionLength
+    });
 
     const newState = {
-      undo: commandStack.canUndo(),
+      canExport: [ 'svg', 'png' ],
       redo: commandStack.canRedo(),
-      canExport: [ 'svg', 'png' ]
+      undo: commandStack.canUndo()
     };
 
     if (typeof onChanged === 'function') {
-      onChanged(newState);
+      onChanged({
+        ...newState,
+        editMenu
+      });
     }
 
     this.setState(newState);
diff --git a/client/src/app/tabs/cmmn/getCmmnEditMenu.js b/client/src/app/tabs/cmmn/getCmmnEditMenu.js
new file mode 100644
index 0000000000..d21207d801
--- /dev/null
+++ b/client/src/app/tabs/cmmn/getCmmnEditMenu.js
@@ -0,0 +1,19 @@
+import {
+  getCanvasEntries,
+  getDiagramFindEntries,
+  getSelectionEntries,
+  getToolEntries,
+  getUndoRedoEntries
+} from '../getEditMenu';
+
+export function getCmmnEditMenu(state) {
+  return [
+    getUndoRedoEntries(state),
+    getToolEntries(state),
+    getDiagramFindEntries(state),
+    [
+      ...getCanvasEntries(state),
+      ...getSelectionEntries(state)
+    ]
+  ];
+}
\ No newline at end of file
diff --git a/client/src/app/tabs/dmn/DmnEditor.js b/client/src/app/tabs/dmn/DmnEditor.js
index bff9d379b7..32ad771517 100644
--- a/client/src/app/tabs/dmn/DmnEditor.js
+++ b/client/src/app/tabs/dmn/DmnEditor.js
@@ -15,6 +15,14 @@ import {
 
 import CamundaDmnModeler from './DmnModeler';
 
+import { active as isInputActive } from '../../../util/dom/is-input';
+
+import {
+  getDmnDrdEditMenu,
+  getDmnDecisionTableEditMenu,
+  getDmnLiteralExpressionEditMenu
+} from './getDmnEditMenu';
+
 import css from './DmnEditor.less';
 
 
@@ -68,9 +76,12 @@ class DmnEditor extends CachedComponent {
 
     [
       'saveXML.done',
-      'attach'
+      'attach',
+      // TODO(philippfromme): fix, this will result in endless update loop
+      // 'view.selectionChanged',
+      'view.directEditingChanged'
     ].forEach((event) => {
-      modeler[fn](event, this.updateActions);
+      modeler[fn](event, this.handleChanged);
     });
 
     modeler[fn]('views.changed', this.viewsChanged);
@@ -97,7 +108,7 @@ class DmnEditor extends CachedComponent {
   }
 
   viewContentChanged = () => {
-    this.updateActions();
+    this.handleChanged();
 
     this.props.onChanged(this.checkDirty());
   }
@@ -170,7 +181,7 @@ class DmnEditor extends CachedComponent {
       views
     });
 
-    this.updateActions();
+    this.handleChanged();
   }
 
   undo = () => {
@@ -189,7 +200,7 @@ class DmnEditor extends CachedComponent {
     modeler.getActiveViewer().get('commandStack').redo();
   }
 
-  updateActions = (event) => {
+  handleChanged = (event) => {
     const {
       modeler
     } = this.getCached();
@@ -198,7 +209,8 @@ class DmnEditor extends CachedComponent {
       onChanged
     } = this.props;
 
-    const activeViewer = modeler.getActiveViewer();
+    const activeViewer = modeler.getActiveViewer(),
+          activeView = modeler.getActiveView();
 
     if (!activeViewer) {
       return;
@@ -206,18 +218,47 @@ class DmnEditor extends CachedComponent {
 
     const commandStack = activeViewer.get('commandStack');
 
+    const inputActive = isInputActive();
+
+    const editMenuState = {
+      redo: commandStack.canRedo(),
+      undo: commandStack.canUndo()
+    };
+
+    let editMenu;
+
+    if (activeView.type === 'drd') {
+      editMenu = getDmnDrdEditMenu({
+        ...editMenuState,
+        editLabel: !inputActive && !!activeViewer.get('selection').get().length,
+        lassoTool: !inputActive,
+        removeSelected: false
+      });
+    } else if (activeView.type === 'decisionTable') {
+      editMenu = getDmnDecisionTableEditMenu({
+        ...editMenuState,
+        hasSelection: activeViewer.get('selection').hasSelection()
+      });
+    } else if (activeView.type === 'literalExpression') {
+      editMenu = getDmnLiteralExpressionEditMenu({
+        ...editMenuState
+      });
+    }
+
     const newState = {
-      undo: commandStack.canUndo(),
+      canExport: 'saveSVG' in activeViewer ? [ 'svg', 'png' ] : false,
       redo: commandStack.canRedo(),
-      canExport: 'saveSVG' in activeViewer ? [ 'svg', 'png' ] : false
+      undo: commandStack.canUndo()
     };
 
     if (typeof onChanged === 'function') {
-      onChanged(newState);
+      onChanged({
+        ...newState,
+        editMenu
+      });
     }
 
     this.setState(newState);
-
   }
 
   checkImport = () => {
diff --git a/client/src/app/tabs/dmn/getDmnEditMenu.js b/client/src/app/tabs/dmn/getDmnEditMenu.js
new file mode 100644
index 0000000000..358b67632f
--- /dev/null
+++ b/client/src/app/tabs/dmn/getDmnEditMenu.js
@@ -0,0 +1,86 @@
+
+import {
+  getSelectionEntries,
+  getToolEntries,
+  getUndoRedoEntries
+} from '../getEditMenu';
+
+function getDecisionTableEntries({
+  hasSelection
+}) {
+  return [
+    [
+      {
+        label: 'Add Rule',
+        submenu: [{
+          label: 'At End',
+          accelerator: 'CommandOrControl+D',
+          action: 'addRule'
+        }, {
+          label: 'Above Selected',
+          enabled: hasSelection,
+          action: 'addRuleAbove'
+        }, {
+          label: 'Below Selected',
+          enabled: hasSelection,
+          action: 'addRuleBelow'
+        }]
+      }, {
+        label: 'Remove Rule',
+        enabled: hasSelection,
+        action: 'removeRule'
+      }
+    ], [
+      {
+        label: 'Add Clause',
+        submenu: [
+          [
+            {
+              label: 'Input',
+              action: 'addInput'
+            }, {
+              label: 'Output',
+              action: 'addOutput'
+            }
+          ], [
+            {
+              label: 'Left Of Selected',
+              enabled: hasSelection,
+              action: 'addClauseLeft'
+            },
+            {
+              label: 'Right Of Selected',
+              enabled: hasSelection,
+              action: 'addClauseRight'
+            }
+          ]
+        ]
+      }, {
+        label: 'Remove Clause',
+        enabled: hasSelection,
+        action: 'removeClause'
+      }
+    ]
+  ];
+}
+
+export function getDmnDrdEditMenu(state) {
+  return [
+    getUndoRedoEntries(state),
+    getToolEntries(state),
+    getSelectionEntries(state)
+  ];
+}
+
+export function getDmnDecisionTableEditMenu(state) {
+  return [
+    getUndoRedoEntries(state),
+    ...getDecisionTableEntries(state)
+  ];
+}
+
+export function getDmnLiteralExpressionEditMenu(state) {
+  return [
+    getUndoRedoEntries(state)
+  ];
+}
\ No newline at end of file
diff --git a/client/src/app/tabs/getEditMenu.js b/client/src/app/tabs/getEditMenu.js
new file mode 100644
index 0000000000..9c7e228a4e
--- /dev/null
+++ b/client/src/app/tabs/getEditMenu.js
@@ -0,0 +1,135 @@
+export function getUndoRedoEntries({
+  canRedo,
+  canUndo
+}) {
+  return [{
+    label: 'Undo',
+    accelerator: 'CommandOrControl+Z',
+    enabled: canUndo,
+    action: 'undo'
+  }, {
+    label: 'Redo',
+    accelerator: 'CommandOrControl+Y',
+    enabled: canRedo,
+    action: 'redo'
+  }];
+}
+
+export function getToolEntries({
+  editLabel,
+  globalConnectTool,
+  handTool,
+  lassoTool,
+  spaceTool
+}) {
+  const menuEntries = [];
+
+  if (handTool !== undefined) {
+    menuEntries.push({
+      label: 'Hand Tool',
+      accelerator: 'H',
+      enabled: handTool,
+      action: 'handTool'
+    });
+  }
+
+  if (lassoTool !== undefined) {
+    menuEntries.push({
+      label: 'Lasso Tool',
+      accelerator: 'L',
+      enabled: lassoTool,
+      action: 'lassoTool'
+    });
+  }
+
+  if (spaceTool !== undefined) {
+    menuEntries.push({
+      label: 'Space Tool',
+      accelerator: 'S',
+      enabled: spaceTool,
+      action: 'spaceTool'
+    });
+  }
+
+  if (globalConnectTool !== undefined) {
+    menuEntries.push({
+      label: 'Global Connect Tool',
+      accelerator: 'C',
+      enabled: globalConnectTool,
+      action: 'globalConnectTool'
+    });
+  }
+
+  if (editLabel !== undefined) {
+    menuEntries.push({
+      label: 'Edit Label',
+      accelerator: 'E',
+      enabled: editLabel,
+      action: 'editLabel'
+    });
+  }
+
+  return menuEntries;
+}
+
+export function getDiagramFindEntries({
+  find
+}) {
+  return [{
+    label: 'Find',
+    accelerator: 'CommandOrControl+F',
+    enabled: find,
+    action: 'find'
+  }];
+}
+
+export function getCanvasEntries({
+  moveCanvas,
+  moveToOrigin
+}) {
+  const menuEntries = [];
+
+  if (moveToOrigin !== undefined) {
+    menuEntries.push({
+      label: 'Move Elements To Origin',
+      accelerator: 'CommandOrControl+Shit+O',
+      enabled: moveToOrigin,
+      action: 'moveToOrigin'
+    });
+  }
+
+  return [
+    ...menuEntries,
+    {
+      label: 'Move Canvas',
+      enabled: moveCanvas,
+      submenu: [ 'Up', 'Left', 'Down', 'Right' ].map(direction => {
+        return {
+          label: `Move ${direction}`,
+          accelerator: direction,
+          enabled: moveCanvas,
+          action: 'moveCanvas',
+          options: {
+            direction: direction.toLowerCase()
+          }
+        };
+      })
+    }
+  ];
+}
+
+export function getSelectionEntries({
+  removeSelected,
+  selectAll
+}) {
+  return [{
+    label: 'Select All',
+    accelerator: 'CommandOrControl+A',
+    action: 'selectElements'
+  }, {
+    label: 'Remove Selected',
+    accelerator: 'Delete',
+    enabled: removeSelected,
+    action: 'removeSelection'
+  }];
+}
\ No newline at end of file
diff --git a/client/src/app/tabs/xml/XMLEditor.js b/client/src/app/tabs/xml/XMLEditor.js
index 8b955d6d66..7ad78ffe28 100644
--- a/client/src/app/tabs/xml/XMLEditor.js
+++ b/client/src/app/tabs/xml/XMLEditor.js
@@ -1,9 +1,5 @@
 import React from 'react';
 
-import { Fill } from '../../slot-fill';
-
-import { Button } from '../../primitives';
-
 import {
   WithCache,
   WithCachedState,
@@ -14,6 +10,8 @@ import CodeMirror from './CodeMirror';
 
 import css from './XMLEditor.less';
 
+import { getXMLEditMenu } from './getXMLEditMenu';
+
 
 class XMLEditor extends CachedComponent {
 
@@ -23,9 +21,6 @@ class XMLEditor extends CachedComponent {
     this.state = {};
 
     this.ref = React.createRef();
-
-    console.log('%cXMLEditor#constructor', 'background: orange; color: white; padding: 2px 4px', this.state);
-
   }
 
   shouldComponentUpdate(nextProps) {
@@ -106,16 +101,47 @@ class XMLEditor extends CachedComponent {
 
   handleChange = () => {
     const {
-      onChange
+      onChanged
     } = this.props;
 
+    const {
+      lastXML
+    } = this.state;
+
     const {
       editor
     } = this.getCached();
 
-    if (typeof onChange === 'function') {
-      onChange(editor.lastXML !== editor.getValue());
+    // on initial import, reset history to prevent
+    // undo by the user
+    if (!lastXML) {
+      editor.doc.clearHistory();
     }
+
+    const history = editor.doc.historySize();
+
+    const editMenu = getXMLEditMenu({
+      canRedo: !!history.redo,
+      canUndo: !!history.undo
+    });
+
+    const newState = {
+      canExport: false,
+      redo: !!history.redo,
+      undo: !!history.undo
+    };
+
+    if (typeof onChanged === 'function') {
+      onChanged({
+        ...newState,
+        editMenu
+      });
+    }
+
+    this.setState({
+      ...newState,
+      lastXML: this.getXML()
+    });
   }
 
   getXML() {
@@ -127,14 +153,8 @@ class XMLEditor extends CachedComponent {
   }
 
   render() {
-    console.log('%cXMLEditor#render', 'background: orange; color: white; padding: 2px 4px', this.state);
-
     return (
       <div className={ css.XMLEditor }>
-        <Fill name="toolbar">
-          <Button disabled={ !this.state.undo } onClick={ this.undo }>Undo</Button>
-          <Button disabled={ !this.state.redo } onClick={ this.redo }>Redo</Button>
-        </Fill>
         <div className="content" ref={ this.ref }></div>
       </div>
     );
diff --git a/client/src/app/tabs/xml/getXMLEditMenu.js b/client/src/app/tabs/xml/getXMLEditMenu.js
new file mode 100644
index 0000000000..45d28cf30e
--- /dev/null
+++ b/client/src/app/tabs/xml/getXMLEditMenu.js
@@ -0,0 +1,30 @@
+import {
+  getUndoRedoEntries
+} from '../getEditMenu';
+
+function getXMLFindEntries() {
+  return [{
+    label: 'Find',
+    accelerator: 'CommandOrControl+F',
+    action: 'find'
+  }, {
+    label: 'Find Next',
+    accelerator: 'Shift+CommandOrControl+N',
+    action: 'findNext'
+  }, {
+    label: 'Find Previous',
+    accelerator: 'Shift+CommandOrControl+P',
+    action: 'findPrev'
+  }, {
+    label: 'Replace',
+    accelerator: 'Shift+CommandOrControl+F',
+    action: 'replace'
+  }];
+}
+
+export function getXMLEditMenu(state) {
+  return [
+    getUndoRedoEntries(state),
+    getXMLFindEntries()
+  ];
+}
\ No newline at end of file
diff --git a/client/src/remote/Backend.js b/client/src/remote/Backend.js
index f482380fd0..dbc6ae2344 100644
--- a/client/src/remote/Backend.js
+++ b/client/src/remote/Backend.js
@@ -74,7 +74,10 @@ export default class Backend {
     this.send('context-menu:open', type, options);
   }
 
-  updateMenu = (state) => {
+  updateMenu = (state = {}) => {
+    console.log('%cupdateMenu, editor id: ' + state.id + ', state:', 'background-color: #52b415; color: white');
+    console.log(state);
+
     this.send('menu:update', state);
   }
 
diff --git a/client/src/util/dom/is-input.js b/client/src/util/dom/is-input.js
new file mode 100644
index 0000000000..7dd15ccc5d
--- /dev/null
+++ b/client/src/util/dom/is-input.js
@@ -0,0 +1,17 @@
+export function isInput(element) {
+  return (
+    element.tagName === 'TEXTAREA' ||
+    element.tagName === 'INPUT' ||
+    element.contentEditable === 'true'
+  );
+}
+
+export function active(element) {
+  element = element || document.activeElement;
+
+  if (!element) {
+    element = document.getSelection().focusNode;
+  }
+
+  return isInput(element);
+}
\ No newline at end of file