diff --git a/src/kernel/desktop-procs.c b/src/kernel/desktop-procs.c
index 7daaafe7..fbecee66 100644
--- a/src/kernel/desktop-procs.c
+++ b/src/kernel/desktop-procs.c
@@ -3545,11 +3545,6 @@ static int dskOnRemoveCtrlInstance (PCONTROL pParent, PCONTROL pCtrl)
             cliFreeZOrderNode ((PMAINWIN)pCtrl);
     }
 
-    if (fFound) {
-        pCtrl->pcci->nUseCount --;
-        return 0;
-    }
-
     if ((HWND)pCtrl == __mg_captured_wnd) {
         /* force release the capture */
         __mg_captured_wnd = 0;
@@ -3564,6 +3559,11 @@ static int dskOnRemoveCtrlInstance (PCONTROL pParent, PCONTROL pCtrl)
         sg_msgAutoRepeat.hwnd = 0;
     }
 
+    if (fFound) {
+        pCtrl->pcci->nUseCount--;
+        return 0;
+    }
+
     return -1;
 }