diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts
index 282bccc3b..1797888b0 100644
--- a/packages/web/src/commands/stdCommands.ts
+++ b/packages/web/src/commands/stdCommands.ts
@@ -6,6 +6,7 @@ import ConnectionModal from '../modals/ConnectionModal.svelte';
 import { showModal } from '../modals/modalTools';
 import newQuery from '../query/newQuery';
 import saveTabFile, { saveTabEnabledStore } from '../utility/saveTabFile';
+import openNewTab from '../utility/openNewTab';
 
 function themeCommand(theme: ThemeDefinition) {
   return {
@@ -66,11 +67,39 @@ registerCommand({
   onClick: () => newQuery(),
 });
 
+registerCommand({
+  id: 'new.shell',
+  category: 'New',
+  icon: 'img shell',
+  name: 'JavaScript Shell',
+  onClick: () => {
+    openNewTab({
+      title: 'Shell #',
+      icon: 'img shell',
+      tabComponent: 'ShellTab',
+    });
+  },
+});
+
+registerCommand({
+  id: 'new.markdown',
+  category: 'New',
+  icon: 'img markdown',
+  name: 'Markdown page',
+  onClick: () => {
+    openNewTab({
+      title: 'Page #',
+      icon: 'img markdown',
+      tabComponent: 'MarkdownEditorTab',
+    });
+  },
+});
+
 export function registerFileCommands({
   idPrefix,
   category,
   editorStore,
-  editorStatusStore,
+  editorStatusStore = undefined,
   folder,
   format,
   fileExtension,
diff --git a/packages/web/src/tabs/MarkdownEditorTab.svelte b/packages/web/src/tabs/MarkdownEditorTab.svelte
new file mode 100644
index 000000000..7286def25
--- /dev/null
+++ b/packages/web/src/tabs/MarkdownEditorTab.svelte
@@ -0,0 +1,108 @@
+<script lang="ts" context="module">
+  const lastFocusedEditor = writable(null);
+  const currentEditor = derived([lastFocusedEditor, activeTabId], ([editor, tabid]) =>
+    editor?.getTabId() == tabid ? editor : null
+  );
+
+  registerFileCommands({
+    idPrefix: 'markdown',
+    category: 'Markdown',
+    editorStore: currentEditor,
+    folder: 'markdown',
+    format: 'text',
+    fileExtension: 'md',
+
+    toggleComment: true,
+    findReplace: true,
+  });
+
+  registerCommand({
+    id: 'markdown.preview',
+    category: 'Markdown',
+    name: 'Preview',
+    icon: 'icon run',
+    toolbar: true,
+    keyText: 'F5 | Ctrl+Enter',
+    enabledStore: derived(currentEditor, query => query != null),
+    onClick: () => (get(currentEditor) as any).preview(),
+  });
+</script>
+
+<script lang="ts">
+  import { get_current_component } from 'svelte/internal';
+  import { getContext } from 'svelte';
+  import { get, derived, writable } from 'svelte/store';
+  import registerCommand from '../commands/registerCommand';
+  import { registerFileCommands } from '../commands/stdCommands';
+
+  import VerticalSplitter from '../elements/VerticalSplitter.svelte';
+  import AceEditor from '../query/AceEditor.svelte';
+  import RunnerOutputPane from '../query/RunnerOutputPane.svelte';
+  import useEditorData from '../query/useEditorData';
+  import { activeTabId, nullStore } from '../stores';
+  import axiosInstance from '../utility/axiosInstance';
+  import memberStore from '../utility/memberStore';
+  import socket from '../utility/socket';
+  import useEffect from '../utility/useEffect';
+
+  export let tabid;
+
+  const tabVisible: any = getContext('tabVisible');
+
+  let runnerId;
+
+  const instance = get_current_component();
+
+
+  let domEditor;
+
+
+  $: if ($tabVisible && domEditor) {
+    domEditor?.getEditor()?.focus();
+  }
+
+  export function getData() {
+    return $editorState.value || '';
+  }
+
+  export function toggleComment() {
+    domEditor.getEditor().execCommand('togglecomment');
+  }
+
+  export function find() {
+    domEditor.getEditor().execCommand('find');
+  }
+
+  export function replace() {
+    domEditor.getEditor().execCommand('replace');
+  }
+
+  export function getTabId() {
+    return tabid;
+  }
+
+  const { editorState, editorValue, setEditorData } = useEditorData({ tabid });
+
+  function createMenu() {
+    return [
+      { command: 'markdown.preview' },
+      { divider: true },
+      { command: 'markdown.toggleComment' },
+      { divider: true },
+      { command: 'markdown.save' },
+      { command: 'markdown.saveAs' },
+      { divider: true },
+      { command: 'markdown.find' },
+      { command: 'markdown.replace' },
+    ];
+  }
+</script>
+
+<AceEditor
+  value={$editorState.value || ''}
+  menu={createMenu()}
+  on:input={e => setEditorData(e.detail)}
+  on:focus={() => lastFocusedEditor.set(instance)}
+  bind:this={domEditor}
+  mode="markdown"
+/>
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index 6fbededab..9e935307b 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -1,22 +1,22 @@
 <script lang="ts" context="module">
-  const lastFocusedQuery = writable(null);
-  const currentQuery = derived([lastFocusedQuery, activeTabId], ([query, tabid]) =>
-    query?.getTabId() == tabid ? query : null
+  const lastFocusedEditor = writable(null);
+  const currentEditor = derived([lastFocusedEditor, activeTabId], ([editor, tabid]) =>
+    editor?.getTabId() == tabid ? editor : null
   );
-  const currentQueryStatus = memberStore(currentQuery, query => query?.getStatus() || nullStore);
+  const currentEditorStatus = memberStore(currentEditor, editor => editor?.getStatus() || nullStore);
 
   registerCommand({
     id: 'query.formatCode',
     category: 'Query',
     name: 'Format code',
-    enabledStore: derived(currentQuery, query => query != null),
-    onClick: () => get(currentQuery).formatCode(),
+    enabledStore: derived(currentEditor, query => query != null),
+    onClick: () => get(currentEditor).formatCode(),
   });
   registerFileCommands({
     idPrefix: 'query',
     category: 'Query',
-    editorStore: currentQuery,
-    editorStatusStore: currentQueryStatus,
+    editorStore: currentEditor,
+    editorStatusStore: currentEditorStatus,
     folder: 'sql',
     format: 'text',
     fileExtension: 'sql',
@@ -207,7 +207,7 @@
       value={$editorState.value || ''}
       menu={createMenu()}
       on:input={e => setEditorData(e.detail)}
-      on:focus={() => lastFocusedQuery.set(instance)}
+      on:focus={() => lastFocusedEditor.set(instance)}
       bind:this={domEditor}
     />
   </svelte:fragment>
diff --git a/packages/web/src/tabs/ShellTab.svelte b/packages/web/src/tabs/ShellTab.svelte
index 45c23fd91..7ae7e6968 100644
--- a/packages/web/src/tabs/ShellTab.svelte
+++ b/packages/web/src/tabs/ShellTab.svelte
@@ -1,15 +1,15 @@
 <script lang="ts" context="module">
-  const lastFocusedShell = writable(null);
-  const currentShell = derived([lastFocusedShell, activeTabId], ([shell, tabid]) =>
-    shell?.getTabId() == tabid ? shell : null
+  const lastFocusedEditor = writable(null);
+  const currentEditor = derived([lastFocusedEditor, activeTabId], ([editor, tabid]) =>
+    editor?.getTabId() == tabid ? editor : null
   );
-  const currentShellStatus = memberStore(currentShell, shell => shell?.getStatus() || nullStore);
+  const currentEditorStatus = memberStore(currentEditor, editor => editor?.getStatus() || nullStore);
 
   registerFileCommands({
     idPrefix: 'shell',
     category: 'Shell',
-    editorStore: currentShell,
-    editorStatusStore: currentShellStatus,
+    editorStore: currentEditor,
+    editorStatusStore: currentEditorStatus,
     folder: 'shell',
     format: 'text',
     fileExtension: 'js',
@@ -165,7 +165,7 @@
       value={$editorState.value || ''}
       menu={createMenu()}
       on:input={e => setEditorData(e.detail)}
-      on:focus={() => lastFocusedShell.set(instance)}
+      on:focus={() => lastFocusedEditor.set(instance)}
       bind:this={domEditor}
       mode="javascript"
     />
diff --git a/packages/web/src/tabs/index.js b/packages/web/src/tabs/index.js
index b586a783e..f05efecc3 100644
--- a/packages/web/src/tabs/index.js
+++ b/packages/web/src/tabs/index.js
@@ -8,7 +8,7 @@ import * as ShellTab from './ShellTab.svelte';
 // import FreeTableTab from './FreeTableTab';
 // import PluginTab from './PluginTab';
 // import ChartTab from './ChartTab';
-// import MarkdownEditorTab from './MarkdownEditorTab';
+import * as MarkdownEditorTab from './MarkdownEditorTab.svelte';
 // import MarkdownViewTab from './MarkdownViewTab';
 // import MarkdownPreviewTab from './MarkdownPreviewTab';
 // import FavoriteEditorTab from './FavoriteEditorTab';
@@ -25,7 +25,7 @@ export default {
   //   FreeTableTab,
   //   PluginTab,
   //   ChartTab,
-  //   MarkdownEditorTab,
+  MarkdownEditorTab,
   //   MarkdownViewTab,
   //   MarkdownPreviewTab,
   //   FavoriteEditorTab,