diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
index 1eb900dcc90..8064558d1d3 100644
--- a/src/app/composer/qgscomposer.cpp
+++ b/src/app/composer/qgscomposer.cpp
@@ -151,12 +151,13 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title ): QMainWindow(),
   viewMenu->addAction( mActionZoomIn );
   viewMenu->addAction( mActionZoomOut );
   viewMenu->addAction( mActionZoomAll );
-  viewMenu->addAction( mActionUndo );
-  viewMenu->addAction( mActionRedo );
   viewMenu->addSeparator();
   viewMenu->addAction( mActionRefreshView );
 
   QMenu *layoutMenu = menuBar()->addMenu( tr( "Layout" ) );
+  layoutMenu->addAction( mActionUndo );
+  layoutMenu->addAction( mActionRedo );
+  layoutMenu->addSeparator();
   layoutMenu->addAction( mActionAddNewMap );
   layoutMenu->addAction( mActionAddNewLabel );
   layoutMenu->addAction( mActionAddNewScalebar );
diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui
index 845c87f995d..38d56429198 100644
--- a/src/ui/qgscomposerbase.ui
+++ b/src/ui/qgscomposerbase.ui
@@ -163,9 +163,9 @@
    <addaction name="mActionZoomIn"/>
    <addaction name="mActionZoomOut"/>
    <addaction name="mActionRefreshView"/>
+   <addaction name="separator"/>
    <addaction name="mActionUndo"/>
    <addaction name="mActionRedo"/>
-   <addaction name="separator"/>
    <addaction name="mActionAddNewMap"/>
    <addaction name="mActionAddImage"/>
    <addaction name="mActionAddNewLabel"/>
@@ -493,6 +493,9 @@
    <property name="toolTip">
     <string>Revert last change</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Z</string>
+   </property>
   </action>
   <action name="mActionRedo">
    <property name="icon">
@@ -505,6 +508,9 @@
    <property name="toolTip">
     <string>Restore last change</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+Z</string>
+   </property>
   </action>
  </widget>
  <tabstops>