diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c
index 9acd3f43b93..621c5fdfe04 100644
--- a/dlls/shell32/autocomplete.c
+++ b/dlls/shell32/autocomplete.c
@@ -136,9 +136,15 @@ static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *st
 
 static void autoappend_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len, WCHAR *str, HWND hwnd)
 {
+    DWORD sel_start;
     WCHAR *tmp;
     size_t size;
 
+    /* Don't auto-append unless the caret is at the end */
+    SendMessageW(hwnd, EM_GETSEL, (WPARAM)&sel_start, 0);
+    if (sel_start != len)
+        return;
+
     /* The character capitalization can be different,
        so merge text and str into a new string */
     size = len + strlenW(&str[len]) + 1;