diff --git a/packages/types/engines.d.ts b/packages/types/engines.d.ts
index 3c26d2cbb..c828a4b9e 100644
--- a/packages/types/engines.d.ts
+++ b/packages/types/engines.d.ts
@@ -115,8 +115,12 @@ export interface EngineDriver extends FilterBehaviourProvider {
   profilerChartAggregateFunction?: string;
   profilerChartMeasures?: { label: string; field: string }[];
   isElectronOnly?: boolean;
+
   collectionSingularLabel?: string;
   collectionPluralLabel?: string;
+  collectionNameLabel?: string;
+  newCollectionFormParams?: any[];
+
   supportedCreateDatabase?: boolean;
   showConnectionField?: (
     field: string,
diff --git a/packages/web/src/forms/FormArgument.svelte b/packages/web/src/forms/FormArgument.svelte
index 8f21fc297..1be374208 100644
--- a/packages/web/src/forms/FormArgument.svelte
+++ b/packages/web/src/forms/FormArgument.svelte
@@ -12,9 +12,9 @@
 </script>
 
 {#if arg.type == 'text'}
-  <FormTextField label={arg.label} {name} defaultValue={arg.default} />
+  <FormTextField label={arg.label} {name} defaultValue={arg.default} focused={arg.focused} />
 {:else if arg.type == 'number'}
-  <FormTextField label={arg.label} type="number" {name} defaultValue={arg.default} />
+  <FormTextField label={arg.label} type="number" {name} defaultValue={arg.default} focused={arg.focused} />
 {:else if arg.type == 'checkbox'}
   <FormCheckboxField label={arg.label} {name} defaultValue={arg.default} />
 {:else if arg.type == 'select'}
diff --git a/packages/web/src/forms/FormArgumentList.svelte b/packages/web/src/forms/FormArgumentList.svelte
index c191ad833..87c342022 100644
--- a/packages/web/src/forms/FormArgumentList.svelte
+++ b/packages/web/src/forms/FormArgumentList.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import FormArgument from './FormArgument.svelte';
 
-  export let namePrefix;
+  export let namePrefix = '';
   export let args: any[];
 </script>
 
diff --git a/packages/web/src/modals/NewCollectionModal.svelte b/packages/web/src/modals/NewCollectionModal.svelte
index 60e5abd8b..4f48026bf 100644
--- a/packages/web/src/modals/NewCollectionModal.svelte
+++ b/packages/web/src/modals/NewCollectionModal.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import FormStyledButton from '../buttons/FormStyledButton.svelte';
+  import FormArgumentList from '../forms/FormArgumentList.svelte';
 
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
@@ -22,7 +23,7 @@
       Create {driver?.collectionSingularLabel ?? 'collection/container'}
     </svelte:fragment>
 
-    <FormTextField label={`New ${driver?.collectionSingularLabel ?? 'collection/container'} name`} name="name" focused />
+    <FormArgumentList args={driver?.newCollectionFormParams} />
 
     <svelte:fragment slot="footer">
       <FormSubmit value="OK" on:click={e => handleSubmit(e.detail)} />
diff --git a/plugins/dbgate-plugin-mongo/src/backend/driver.js b/plugins/dbgate-plugin-mongo/src/backend/driver.js
index cb665d064..f7b1aec2e 100644
--- a/plugins/dbgate-plugin-mongo/src/backend/driver.js
+++ b/plugins/dbgate-plugin-mongo/src/backend/driver.js
@@ -110,8 +110,10 @@ const driver = {
     switch (type) {
       case 'createCollection':
         await this.script(pool, `db.createCollection('${operation.collection.name}')`);
-      case 'dropOperation':
+        break;
+      case 'dropCollection':
         await this.script(pool, `db.dropCollection('${operation.collection}')`);
+        break;
       default:
         throw new Error(`Operation type ${type} not supported`);
     }
diff --git a/plugins/dbgate-plugin-mongo/src/frontend/driver.js b/plugins/dbgate-plugin-mongo/src/frontend/driver.js
index 1434ac8a3..bce6b0bf6 100644
--- a/plugins/dbgate-plugin-mongo/src/frontend/driver.js
+++ b/plugins/dbgate-plugin-mongo/src/frontend/driver.js
@@ -67,6 +67,15 @@ const driver = {
     },
   ],
 
+  newCollectionFormParams: [
+    {
+      type: 'text',
+      label: 'Collection name',
+      name: 'name',
+      focused: true,
+    },
+  ],
+
   getCollectionUpdateScript(changeSet, collectionInfo) {
     let res = '';
     for (const insert of changeSet.inserts) {