diff --git "a/dll/win32/browseui/CAutoComplete.cpp" "b/dll/win32/browseui/CAutoComplete.cpp"
index 6bb970c87f8..8d5607a8702 100644
--- "a/dll/win32/browseui/CAutoComplete.cpp"
+++ "b/dll/win32/browseui/CAutoComplete.cpp"
@@ -272,7 +272,9 @@ EditWordBreakProcW(LPWSTR lpch, INT index, INT count, INT code)
         {
             if (index)
                 --index;
-            while (index && !IsWordBreak(lpch[index]))
+            while (index && 
+            (!IsWordBreak(lpch[index-1]) || (IsWordBreak(lpch[index]) && IsWordBreak(lpch[index-1])))
+            )
                 --index;
             return index;
         }
@@ -280,9 +282,11 @@ EditWordBreakProcW(LPWSTR lpch, INT index, INT count, INT code)
         {
             if (!count)
                 break;
-            while (index < count && lpch[index] && !IsWordBreak(lpch[index]))
+            while (index < count && lpch[index+1] &&
+                !(IsWordBreak(lpch[index]) && !IsWordBreak(lpch[index+1]))
+                )
                 ++index;
-            return index;
+            return index + 1;
         }
     }
     return 0;