diff --git a/packages/web/src/buttons/ToolStripCommandSplitButton.svelte b/packages/web/src/buttons/ToolStripCommandSplitButton.svelte
new file mode 100644
index 000000000..2810e7ab9
--- /dev/null
+++ b/packages/web/src/buttons/ToolStripCommandSplitButton.svelte
@@ -0,0 +1,11 @@
+<script lang="ts">
+  import _ from 'lodash';
+
+  import ToolStripCommandButton from './ToolStripCommandButton.svelte';
+  import ToolStripSplitDropDownButton from './ToolStripSplitDropDownButton.svelte';
+
+  export let commands;
+  $: menu = _.compact(commands).map(command => ({ command }));
+</script>
+
+<ToolStripCommandButton command={commands[0]} component={ToolStripSplitDropDownButton} {menu} />
diff --git a/packages/web/src/buttons/ToolStripSaveButton.svelte b/packages/web/src/buttons/ToolStripSaveButton.svelte
index bdbcc6723..5eb8ffc68 100644
--- a/packages/web/src/buttons/ToolStripSaveButton.svelte
+++ b/packages/web/src/buttons/ToolStripSaveButton.svelte
@@ -1,20 +1,12 @@
 <script lang="ts">
   import getElectron from '../utility/getElectron';
-
-  import ToolStripCommandButton from './ToolStripCommandButton.svelte';
-  import ToolStripSplitDropDownButton from './ToolStripSplitDropDownButton.svelte';
+  import ToolStripCommandSplitButton from './ToolStripCommandSplitButton.svelte';
 
   export let idPrefix;
 
   const electron = getElectron();
 </script>
 
-<ToolStripCommandButton
-  command={`${idPrefix}.save`}
-  component={ToolStripSplitDropDownButton}
-  menu={[
-    { command: `${idPrefix}.save` },
-    { command: `${idPrefix}.saveAs` },
-    electron && { command: `${idPrefix}.saveToDisk` },
-  ]}
+<ToolStripCommandSplitButton
+  commands={[`${idPrefix}.save`, `${idPrefix}.saveAs`, electron && `${idPrefix}.saveToDisk`]}
 />
diff --git a/packages/web/src/tabs/JsonLinesEditorTab.svelte b/packages/web/src/tabs/JsonLinesEditorTab.svelte
index 1ff6d16ef..2b0c88560 100644
--- a/packages/web/src/tabs/JsonLinesEditorTab.svelte
+++ b/packages/web/src/tabs/JsonLinesEditorTab.svelte
@@ -73,8 +73,7 @@
   import openNewTab from '../utility/openNewTab';
   import VerticalSplitter from '../elements/VerticalSplitter.svelte';
   import JslDataGrid from '../datagrid/JslDataGrid.svelte';
-  import runCommand from '../commands/runCommand';
-  import ToolStripSplitDropDownButton from '../buttons/ToolStripSplitDropDownButton.svelte';
+  import ToolStripCommandSplitButton from '../buttons/ToolStripCommandSplitButton.svelte';
 
   export let tabid;
   export let archiveFolder;
@@ -199,11 +198,7 @@
 
   <svelte:fragment slot="toolstrip">
     <ToolStripCommandButton command="jsonl.save" />
-    <ToolStripCommandButton
-      command="jsonl.preview"
-      component={ToolStripSplitDropDownButton}
-      menu={[{ command: 'jsonl.preview' }, { command: 'jsonl.previewNewTab' }]}
-    />
+    <ToolStripCommandSplitButton commands={['jsonl.preview', 'jsonl.previewNewTab']} />
 
     <ToolStripCommandButton command="jsonl.closePreview" />
   </svelte:fragment>
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index 43bc52440..669f3d959 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -71,9 +71,8 @@
   import ToolStripCommandButton from '../buttons/ToolStripCommandButton.svelte';
   import ToolStripContainer from '../buttons/ToolStripContainer.svelte';
   import ToolStripExportButton, { createQuickExportHandlerRef } from '../buttons/ToolStripExportButton.svelte';
-  import ToolStripSplitButton from '../buttons/ToolStripSplitButton.svelte';
-  import ToolStripSplitDropDownButton from '../buttons/ToolStripSplitDropDownButton.svelte';
-import ToolStripSaveButton from '../buttons/ToolStripSaveButton.svelte';
+  import ToolStripSaveButton from '../buttons/ToolStripSaveButton.svelte';
+  import ToolStripCommandSplitButton from '../buttons/ToolStripCommandSplitButton.svelte';
 
   export let tabid;
   export let conid;
@@ -327,11 +326,7 @@ import ToolStripSaveButton from '../buttons/ToolStripSaveButton.svelte';
     </svelte:fragment>
   </VerticalSplitter>
   <svelte:fragment slot="toolstrip">
-    <ToolStripCommandButton
-      command="query.execute"
-      component={ToolStripSplitDropDownButton}
-      menu={[{ command: 'query.execute' }, { command: 'query.executeCurrent' }]}
-    />
+    <ToolStripCommandSplitButton commands={['query.execute', 'query.executeCurrent']} />
     <ToolStripCommandButton command="query.kill" />
     <ToolStripSaveButton idPrefix="query" />
     <ToolStripCommandButton command="query.formatCode" />