diff --git a/common/scintilla_tricks.cpp b/common/scintilla_tricks.cpp
index f1ffb3250d..c9a875bea3 100644
--- a/common/scintilla_tricks.cpp
+++ b/common/scintilla_tricks.cpp
@@ -228,7 +228,9 @@ void SCINTILLA_TRICKS::onCharHook( wxKeyEvent& aEvent )
                 str = data.GetText();
 
                 ConvertSmartQuotesAndDashes( &str );
+                m_te->BeginUndoAction();
                 m_te->AddText( str );
+                m_te->EndUndoAction();
             }
 
             wxTheClipboard->Close();