diff --git a/src/utils/vvim.cpp b/src/utils/vvim.cpp
index af6e506f..ae735ee7 100644
--- a/src/utils/vvim.cpp
+++ b/src/utils/vvim.cpp
@@ -595,6 +595,7 @@ VimMode VVim::getMode() const
 void VVim::setMode(VimMode p_mode)
 {
     if (m_mode != p_mode) {
+        clearSelection();
         m_mode = p_mode;
         resetState();
 
diff --git a/src/veditoperations.cpp b/src/veditoperations.cpp
index 39fef9d8..f2279944 100644
--- a/src/veditoperations.cpp
+++ b/src/veditoperations.cpp
@@ -65,6 +65,9 @@ void VEditOperations::updateCursorLineBg()
 
 void VEditOperations::handleEditConfigUpdated()
 {
+    // Reset to Normal mode.
+    m_vim->setMode(VimMode::Normal);
+
     updateCursorLineBg();
 }