diff --git a/src/documentwindow.cpp b/src/documentwindow.cpp
index 5b82f9dd..a491f8a0 100644
--- a/src/documentwindow.cpp
+++ b/src/documentwindow.cpp
@@ -182,9 +182,9 @@ DocumentWindow::DocumentWindow() :
     selectButton->setToolTip(tr("Select node on canvas"));
     Theme::initAwesomeButton(selectButton);
     
-    QPushButton *markerButton = new QPushButton(QChar(fa::edit));
-    markerButton->setToolTip(tr("Marker pen"));
-    Theme::initAwesomeButton(markerButton);
+    //QPushButton *markerButton = new QPushButton(QChar(fa::edit));
+    //markerButton->setToolTip(tr("Marker pen"));
+    //Theme::initAwesomeButton(markerButton);
     
     QPushButton *paintButton = new QPushButton(QChar(fa::paintbrush));
     paintButton->setToolTip(tr("Paint brush"));
@@ -270,7 +270,7 @@ DocumentWindow::DocumentWindow() :
 
     toolButtonLayout->addWidget(addButton);
     toolButtonLayout->addWidget(selectButton);
-    toolButtonLayout->addWidget(markerButton);
+    //toolButtonLayout->addWidget(markerButton);
     toolButtonLayout->addWidget(paintButton);
     //toolButtonLayout->addWidget(dragButton);
     toolButtonLayout->addWidget(zoomInButton);
@@ -926,9 +926,9 @@ DocumentWindow::DocumentWindow() :
         m_document->setEditMode(SkeletonDocumentEditMode::Select);
     });
     
-    connect(markerButton, &QPushButton::clicked, [=]() {
-        m_document->setEditMode(SkeletonDocumentEditMode::Mark);
-    });
+    //connect(markerButton, &QPushButton::clicked, [=]() {
+    //    m_document->setEditMode(SkeletonDocumentEditMode::Mark);
+    //});
     
     connect(paintButton, &QPushButton::clicked, [=]() {
         m_document->setEditMode(SkeletonDocumentEditMode::Paint);
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index 3edf0a7f..5c08cb47 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -15,7 +15,7 @@ void initShortCuts(QWidget *widget, SkeletonGraphicsWidget *graphicsWidget)
     defineKey(Qt::Key_Delete, &SkeletonGraphicsWidget::shortcutDelete);
     defineKey(Qt::Key_Backspace, &SkeletonGraphicsWidget::shortcutDelete);
     defineKey(Qt::Key_A, &SkeletonGraphicsWidget::shortcutAddMode);
-    defineKey(Qt::Key_G, &SkeletonGraphicsWidget::shortcutMarkMode);
+    //defineKey(Qt::Key_G, &SkeletonGraphicsWidget::shortcutMarkMode);
     defineKey(Qt::CTRL + Qt::Key_A, &SkeletonGraphicsWidget::shortcutSelectAll);
     defineKey(Qt::CTRL + Qt::Key_Z, &SkeletonGraphicsWidget::shortcutUndo);
     defineKey(Qt::CTRL + Qt::SHIFT + Qt::Key_Z, &SkeletonGraphicsWidget::shortcutRedo);
diff --git a/src/skeletongraphicswidget.cpp b/src/skeletongraphicswidget.cpp
index 36de49ce..0caec937 100644
--- a/src/skeletongraphicswidget.cpp
+++ b/src/skeletongraphicswidget.cpp
@@ -142,7 +142,8 @@ void SkeletonGraphicsWidget::setBackgroundBlur(float turnaroundOpacity)
 void SkeletonGraphicsWidget::shortcutEscape()
 {
     if (SkeletonDocumentEditMode::Add == m_document->editMode ||
-            SkeletonDocumentEditMode::Mark == m_document->editMode) {
+            SkeletonDocumentEditMode::Mark == m_document->editMode ||
+            SkeletonDocumentEditMode::Paint == m_document->editMode) {
         emit setEditMode(SkeletonDocumentEditMode::Select);
         return;
     }
@@ -1821,10 +1822,10 @@ void SkeletonGraphicsWidget::shortcutAddMode()
     }
 }
 
-void SkeletonGraphicsWidget::shortcutMarkMode()
-{
-    emit setEditMode(SkeletonDocumentEditMode::Mark);
-}
+//void SkeletonGraphicsWidget::shortcutMarkMode()
+//{
+//    emit setEditMode(SkeletonDocumentEditMode::Mark);
+//}
 
 void SkeletonGraphicsWidget::shortcutUndo()
 {
diff --git a/src/skeletongraphicswidget.h b/src/skeletongraphicswidget.h
index 781a45b8..1b672a2b 100644
--- a/src/skeletongraphicswidget.h
+++ b/src/skeletongraphicswidget.h
@@ -618,7 +618,7 @@ public slots:
     void setRotated(bool rotated);
     void shortcutDelete();
     void shortcutAddMode();
-    void shortcutMarkMode();
+    //void shortcutMarkMode();
     void shortcutUndo();
     void shortcutRedo();
     void shortcutXlock();