diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 95df727b28b13344d44145ad1a8bcb84021a1777..dc0fbe3e7cabd940c7ae588b2df74f5659e0298a 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -578,9 +578,6 @@
    <property name="toolTip">
     <string>Save CognitiveMap</string>
    </property>
-   <property name="shortcut">
-    <string>Ctrl+S</string>
-   </property>
    <property name="visible">
     <bool>false</bool>
    </property>
diff --git a/src/GraphicView.cpp b/src/GraphicView.cpp
index 6294e884cb1ba58c7d4519171848acacfed9e856..1a79ff4e90a52ed60b583e1d7261202f773cc9d1 100644
--- a/src/GraphicView.cpp
+++ b/src/GraphicView.cpp
@@ -1169,6 +1169,8 @@ void jpsGraphicsView::Undo()
 {
     if (!_undoStack.IsEmpty())
     {
+        emit no_drawing();
+
         const LineAction recentAction = _undoStack.GetRecentAction();
 
         if (recentAction.GetName()=="LineDeleted")
@@ -1196,6 +1198,8 @@ void jpsGraphicsView::Redo()
 {
     if (!_redoStack.IsEmpty())
     {
+        emit no_drawing();
+
         const LineAction recentAction = _redoStack.GetRecentAction();
 
         if (recentAction.GetName()=="LineDeleted")