diff --git a/reactos/base/applications/mscutils/servman/mainwnd.c b/reactos/base/applications/mscutils/servman/mainwnd.c
index 9e3e81e6509..b3d90d14354 100644
--- a/reactos/base/applications/mscutils/servman/mainwnd.c
+++ b/reactos/base/applications/mscutils/servman/mainwnd.c
@@ -451,6 +451,12 @@ ListViewSelectionChanged(PMAIN_WND_INFO Info,
         EnableMenuItem(hMainMenu,
                        ID_PROP,
                        MF_ENABLED);
+        EnableMenuItem(Info->hShortcutMenu,
+                       ID_PROP,
+                       MF_ENABLED);
+        SetMenuDefaultItem(Info->hShortcutMenu,
+                           ID_PROP,
+                           MF_BYCOMMAND);
     }
 
     /* activate delete menu item, if not already */
@@ -466,7 +472,6 @@ ListViewSelectionChanged(PMAIN_WND_INFO Info,
                        MF_ENABLED);
     }
 
-
     /* set selected service */
     Info->SelectedItem = pnmv->iItem;
 
@@ -487,8 +492,6 @@ ListViewSelectionChanged(PMAIN_WND_INFO Info,
                 TB_SETSTATE,
                 ID_PROP,
                 (LPARAM)MAKELONG(TBSTATE_ENABLED, 0));
-
-
 }