diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 754d817cd20..1f64cbeebdd 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -5879,6 +5879,7 @@ static HWND CreateEditLabelT(LISTVIEW_INFO *infoPtr, LPCWSTR text, BOOL isW)
                SetWindowLongPtrA(hedit, GWLP_WNDPROC, (DWORD_PTR)EditLblWndProcA) );
 
     SendMessageW(hedit, WM_SETFONT, (WPARAM)infoPtr->hFont, FALSE);
+    SendMessageW(hedit, EM_SETLIMITTEXT, DISP_TEXT_SIZE-1, 0);
 
     return hedit;
 }
diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index a7de6e75593..c2bf70be139 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -350,7 +350,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
               if (edit)
               {
                   INT len = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0);
-                  todo_wine ok(len == 259 || broken(len == 260) /* includes NULL in NT4 */,
+                  ok(len == 259 || broken(len == 260) /* includes NULL in NT4 */,
                       "text limit %d, expected 259\n", len);
               }