diff --git a/reactos/base/applications/mscutils/servman/mainwnd.c b/reactos/base/applications/mscutils/servman/mainwnd.c
index 1afef868a9f..76ff4f3f6c6 100644
--- a/reactos/base/applications/mscutils/servman/mainwnd.c
+++ b/reactos/base/applications/mscutils/servman/mainwnd.c
@@ -700,9 +700,11 @@ MainWndProc(HWND hwnd,
                 {
                     LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam;
 
-                    ListViewSelectionChanged(Info, pnmv);
-                    SetMenuAndButtonStates(Info);
-
+                    if (pnmv->uNewState != 0)
+                    {
+                        ListViewSelectionChanged(Info, pnmv);
+                        SetMenuAndButtonStates(Info);
+                    }
                 }
                 break;