diff --git a/lib/third_party/imgui/ColorTextEditor/source/TextEditor.cpp b/lib/third_party/imgui/ColorTextEditor/source/TextEditor.cpp
index 8c540a4e4..becd24943 100644
--- a/lib/third_party/imgui/ColorTextEditor/source/TextEditor.cpp
+++ b/lib/third_party/imgui/ColorTextEditor/source/TextEditor.cpp
@@ -392,8 +392,13 @@ TextEditor::Coordinates TextEditor::FindWordEnd(const Coordinates &aFrom) const
     while (cindex < (line.size()) && !isWordChar(line[cindex].mChar))
         ++cindex;
 
-    while (cindex < (line.size()) && isWordChar(line[cindex].mChar))
-        ++cindex;
+    if (prevspace != !!isspace(c)) {
+        if (isspace(c))
+            while (cindex < (int)line.size() && isspace(line[cindex].mChar))
+                ++cindex;
+        break;
+    }
+    cindex += d;
 
     if (line[cindex-1].mChar == '\"')
         --cindex;