diff --git a/NEWS.md b/NEWS.md
index 6b7e34a5..d027d51a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -18,6 +18,7 @@ Red Panda C++ Version 2.17
   - enhancement: Shift+Down in the last line will expand selection to the end of the line.
   - enhancement: If no selection, Ctrl+C (Copy) auto selects the current line and put the cursor to the beginning.
   - fix: Chinese characters in the source code is not correctly displayed in the CPU info window.
+  - fix: Can't undo & save after copy by drag with mouse.
 
 
 Red Panda C++ Version 2.16
diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro
index a14058e5..26e017a6 100644
--- a/RedPandaIDE/RedPandaIDE.pro
+++ b/RedPandaIDE/RedPandaIDE.pro
@@ -129,7 +129,7 @@ SOURCES += \
     settingsdialog/executorproblemsetwidget.cpp \
     settingsdialog/formattergeneralwidget.cpp \
     settingsdialog/languageasmgenerationwidget.cpp \
-    settingsdialog/languagecformatwidget.cpp \
+#    settingsdialog/languagecformatwidget.cpp \
     settingsdialog/projectcompileparamaterswidget.cpp \
     settingsdialog/projectcompilerwidget.cpp \
     settingsdialog/projectdirectorieswidget.cpp \
@@ -265,7 +265,7 @@ HEADERS += \
     settingsdialog/executorproblemsetwidget.h \
     settingsdialog/formattergeneralwidget.h \
     settingsdialog/languageasmgenerationwidget.h \
-    settingsdialog/languagecformatwidget.h \
+#    settingsdialog/languagecformatwidget.h \
     settingsdialog/projectcompileparamaterswidget.h \
     settingsdialog/projectcompilerwidget.h \
     settingsdialog/projectdirectorieswidget.h \
@@ -373,7 +373,7 @@ FORMS += \
     settingsdialog/executorproblemsetwidget.ui \
     settingsdialog/formattergeneralwidget.ui \
     settingsdialog/languageasmgenerationwidget.ui \
-    settingsdialog/languagecformatwidget.ui \
+#    settingsdialog/languagecformatwidget.ui \
     settingsdialog/projectcompileparamaterswidget.ui \
     settingsdialog/projectcompilerwidget.ui \
     settingsdialog/projectdirectorieswidget.ui \
diff --git a/libs/qsynedit/qsynedit/formatter/cppformatter.cpp b/libs/qsynedit/qsynedit/formatter/cppformatter.cpp
index e7237a06..a2e73211 100644
--- a/libs/qsynedit/qsynedit/formatter/cppformatter.cpp
+++ b/libs/qsynedit/qsynedit/formatter/cppformatter.cpp
@@ -1,7 +1,7 @@
 #include "cppformatter.h"
 #include "../qsynedit.h"
 #include "../syntaxer/cpp.h"
-
+#include <QDebug>
 
 namespace QSynedit {
     CppFormatter::CppFormatter()
@@ -53,15 +53,13 @@ namespace QSynedit {
 
                         &&  lineText.endsWith(':')
                         && (
-                            (getBoolOption("IndentClassMemberVisibilityKeywords",true)
-                              && (
+                            ( (
                                 firstToken == "public" || firstToken == "private"
                                 || firstToken == "protected"
                                  )
                             )
                             ||
-                            (getBoolOption("IndentSwitchCases",true)
-                              && (
+                            ( (
                                  firstToken == "case"
                                  || firstToken == "default"
                                  )
@@ -135,7 +133,5 @@ namespace QSynedit {
 
     void CppFormatter::doInitOptions()
     {
-        mOptions.insert("IndentClassMemberVisibilityKeywords",true);
-        mOptions.insert("IndentSwitchCases",true);
     }
 }
diff --git a/libs/qsynedit/qsynedit/qsynedit.cpp b/libs/qsynedit/qsynedit/qsynedit.cpp
index 757f45ca..4db076a5 100644
--- a/libs/qsynedit/qsynedit/qsynedit.cpp
+++ b/libs/qsynedit/qsynedit/qsynedit.cpp
@@ -6388,9 +6388,8 @@ void QSynEdit::dropEvent(QDropEvent *event)
                 }
             }
         }
-        endEditing();
-
     }
+    endEditing();
     event->acceptProposedAction();
     mDropped = true;
     setTopLine(topLine);