diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.cpp b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.cpp
index 8611c67e58db0ef1c228f688bda84bad12159017..c7d2279fcb6a315fe221c0d7325dc31c4b3f1670 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.cpp
@@ -464,6 +464,10 @@ namespace armarx
         connect(editor->getUI()->actionSettings, SIGNAL(triggered()), this, SLOT(showStatechartEditorSettingsDialog()));
         connect(treeController.get(), SIGNAL(closeAllTabsRequested()), this, SLOT(closeAllTabs()));
 
+        // setup plugin specific shortcuts
+        editor->getUI()->actionOpenStatechartGroup->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+        editor->getUI()->actionOpenStatechartGroup->setShortcut(tr("Ctrl+O"));
+        getWidget()->addAction(editor->getUI()->actionOpenStatechartGroup);
 
 
         stateEditorController.reset(new StateEditorController(editor, treeController, getIceManager()->getCommunicator(), variantInfo, config.selectedProfile, getTipDialog()));
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/StatechartEditorMainWindow.cpp b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/StatechartEditorMainWindow.cpp
index 09cc4facc19f11a9cf158d402ed5668a7778451e..ed2fb48be7b2563a753477572972f78c41f15023 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/StatechartEditorMainWindow.cpp
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/StatechartEditorMainWindow.cpp
@@ -41,7 +41,8 @@ namespace armarx
     {
         ui->setupUi(this);
         setupStatechartGroupsToolbar();
-
+        addAction(ui->actionSave_State);
+        addAction(ui->actionDelete_State);
 
     }
 
@@ -117,11 +118,11 @@ namespace armarx
 
     void StatechartEditorMainWindow::layoutState(statechartmodel::StateInstancePtr instance)
     {
-        if(!instance)
+        if (!instance)
         {
             if (ui->stateTabWidget->currentStateview()
-                    && ui->stateTabWidget->currentStateview()->getScene()
-                    && ui->stateTabWidget->currentStateview()->getScene()->selectedItems().size() > 0)
+                && ui->stateTabWidget->currentStateview()->getScene()
+                && ui->stateTabWidget->currentStateview()->getScene()->selectedItems().size() > 0)
             {
                 StateItem* item = dynamic_cast<StateItem*>(*ui->stateTabWidget->currentStateview()->getScene()->selectedItems().begin());
                 if (item)
@@ -132,8 +133,10 @@ namespace armarx
         }
 
         StatechartView* view = ui->stateTabWidget->currentStateview();
-        if(instance && view)
+        if (instance && view)
+        {
             view->getLayoutController().layoutNow(view->getLayoutController().getStateId(instance->getStateClass()), true);
+        }
 
 
     }
@@ -192,7 +195,7 @@ namespace armarx
     {
         stGroupToolBar = new QToolBar(this);
         stGroupToolBar->setIconSize(QSize(16, 16));
-        ui->gridLayout_3->addWidget(stGroupToolBar,0,0);
+        ui->gridLayout_3->addWidget(stGroupToolBar, 0, 0);
         stGroupToolBar->addAction(ui->actionNew_Statechart_Group);
         stGroupToolBar->addAction(ui->actionOpenStatechartGroup);
         stGroupToolBar->addSeparator();
diff --git a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/StatechartEditorMainWindow.ui b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/StatechartEditorMainWindow.ui
index 772fc7471c343cdef1e0e379fc2a2bc57d62fdbc..ba3df14c8d03373f6f2b29d4233929346d3765ab 100644
--- a/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/StatechartEditorMainWindow.ui
+++ b/source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/StatechartEditorMainWindow.ui
@@ -370,6 +370,9 @@
    <property name="shortcut">
     <string>Del</string>
    </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
   </action>
   <action name="actionNew_State_Definition">
    <property name="icon">
@@ -397,6 +400,12 @@
    <property name="text">
     <string>Save All</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
   </action>
   <action name="actionEdit_State_Properties">
    <property name="icon">
@@ -495,8 +504,8 @@
  </customwidgets>
  <resources>
   <include location="../resources/StatechartEditor.qrc"/>
-  <include location="../../../libraries/ArmarXGuiBase/armarxicons.qrc"/>
   <include location="../../../libraries/qtpropertybrowser/src/qtpropertybrowser.qrc"/>
+  <include location="../../../libraries/ArmarXGuiBase/armarxicons.qrc"/>
  </resources>
  <connections>
   <connection>