diff --git a/reactos/tools/cabman/main.cxx b/reactos/tools/cabman/main.cxx
index 1d25b3012f3..471c306fd4e 100644
--- a/reactos/tools/cabman/main.cxx
+++ b/reactos/tools/cabman/main.cxx
@@ -553,7 +553,16 @@ bool CCABManager::Run()
     switch (Mode)
     {
         case CM_MODE_CREATE:
-            return CreateCabinet();
+        case CM_MODE_CREATE_SIMPLE:
+        {
+            bool ret;
+            if(Mode == CM_MODE_CREATE)
+                ret = CreateCabinet();
+            else
+                ret = CreateSimpleCabinet();
+            CloseCabinet();
+            return ret;
+        }
 
         case CM_MODE_DISPLAY:
             return DisplayCabinet();
@@ -561,9 +570,6 @@ bool CCABManager::Run()
         case CM_MODE_EXTRACT:
             return ExtractFromCabinet();
 
-        case CM_MODE_CREATE_SIMPLE:
-            return CreateSimpleCabinet();
-
         default:
             break;
     }