diff --git a/src/eepp/ui/uicodeeditor.cpp b/src/eepp/ui/uicodeeditor.cpp
index 8a8436f81..2e8e95c1b 100644
--- a/src/eepp/ui/uicodeeditor.cpp
+++ b/src/eepp/ui/uicodeeditor.cpp
@@ -918,7 +918,11 @@ void UICodeEditor::invalidateLongestLineWidth() {
 }
 
 void UICodeEditor::setLineWrapMode( LineWrapMode mode ) {
+	auto prevMode = mLineWrapping.getConfig().mode;
 	mLineWrapping.setLineWrapMode( mode );
+	if ( prevMode != mode && LineWrapMode::NoWrap == mode ) {
+		invalidateLongestLineWidth();
+	}
 }
 
 LineWrapType UICodeEditor::getLineWrapType() const {