diff --git a/packages/web/src/appobj/FavoriteFileAppObject.svelte b/packages/web/src/appobj/FavoriteFileAppObject.svelte
index 417567187..9c431432c 100644
--- a/packages/web/src/appobj/FavoriteFileAppObject.svelte
+++ b/packages/web/src/appobj/FavoriteFileAppObject.svelte
@@ -36,13 +36,14 @@
   import { showModal } from '../modals/modalTools';
   import ConfirmModal from '../modals/ConfirmModal.svelte';
   import getElectron from '../utility/getElectron';
+  import FavoriteModal from '../modals/FavoriteModal.svelte';
 
   export let data;
 
   const electron = getElectron();
 
   const editFavorite = () => {
-    // showModal(modalState => <FavoriteModal modalState={modalState} editingData={data} />);
+    showModal(FavoriteModal, { editingData: data });
   };
 
   const editFavoriteJson = async () => {
diff --git a/packages/web/src/forms/FormValues.svelte b/packages/web/src/forms/FormValues.svelte
new file mode 100644
index 000000000..c43cc2cd8
--- /dev/null
+++ b/packages/web/src/forms/FormValues.svelte
@@ -0,0 +1,7 @@
+<script lang="ts">
+  import { getFormContext } from './FormProviderCore.svelte';
+
+  const { values } = getFormContext();
+</script>
+
+<slot values={$values} />
diff --git a/packages/web/src/modals/FavoriteModal.svelte b/packages/web/src/modals/FavoriteModal.svelte
new file mode 100644
index 000000000..98503ab43
--- /dev/null
+++ b/packages/web/src/modals/FavoriteModal.svelte
@@ -0,0 +1,154 @@
+<script lang="ts">
+  import _ from 'lodash';
+
+  import getElectron from '../utility/getElectron';
+  import hasPermission from '../utility/hasPermission';
+  import localforage from 'localforage';
+  import ModalBase from './ModalBase.svelte';
+  import axiosInstance from '../utility/axiosInstance';
+  import uuidv1 from 'uuid/v1';
+  import { closeCurrentModal } from './modalTools';
+  import { copyTextToClipboard } from '../utility/clipboard';
+  import FormProvider from '../forms/FormProvider.svelte';
+  import FormTextField from '../forms/FormTextField.svelte';
+  import FormCheckboxField from '../forms/FormCheckboxField.svelte';
+  import FormValues from '../forms/FormValues.svelte';
+  import FormSelectField from '../forms/FormSelectField.svelte';
+import FormSubmit from '../forms/FormSubmit.svelte';
+import FormButton from '../forms/FormButton.svelte';
+
+  export let editingData;
+  export let savingTab;
+
+  const electron = getElectron();
+  const savedProperties = ['title', 'icon', 'showInToolbar', 'openOnStartup', 'urlPath'];
+  $: initialValues = savingTab
+    ? {
+        title: savingTab.title,
+        icon: savingTab.icon,
+        urlPath: _.kebabCase(_.deburr(savingTab.title)),
+      }
+    : editingData
+    ? _.pick(editingData, savedProperties)
+    : {};
+
+  $: savedFile = savingTab && savingTab.props && savingTab.props.savedFile;
+
+  const canWriteFavorite = hasPermission('files/favorites/write');
+
+  const getTabSaveData = async values => {
+    const tabdata = {};
+    const skipEditor = !!savedFile && values.whatToSave != 'content';
+
+    const re = new RegExp(`tabdata_(.*)_${savingTab.tabid}`);
+    for (const key of await localforage.keys()) {
+      const match = key.match(re);
+      if (!match) continue;
+      if (skipEditor && match[1] == 'editor') continue;
+      tabdata[match[1]] = await localforage.getItem(key);
+    }
+    for (const key in localStorage) {
+      const match = key.match(re);
+      if (!match) continue;
+      if (skipEditor && match[1] == 'editor') continue;
+      tabdata[match[1]] = JSON.parse(localStorage.getItem(key));
+    }
+    console.log('tabdata', tabdata, skipEditor, savingTab.tabid);
+
+    return {
+      props:
+        values.whatToSave == 'content' && savingTab.props
+          ? _.omit(savingTab.props, ['savedFile', 'savedFormat', 'savedFolder'])
+          : savingTab.props,
+      tabComponent: savingTab.tabComponent,
+      tabdata,
+      ..._.pick(values, savedProperties),
+    };
+  };
+
+  const saveTab = async values => {
+    const data = await getTabSaveData(values);
+
+    axiosInstance.post('files/save', {
+      folder: 'favorites',
+      file: uuidv1(),
+      format: 'json',
+      data,
+    });
+  };
+
+  const saveFile = async values => {
+    const oldDataResp = await axiosInstance.post('files/load', {
+      folder: 'favorites',
+      file: editingData.file,
+      format: 'json',
+    });
+
+    axiosInstance.post('files/save', {
+      folder: 'favorites',
+      file: editingData.file,
+      format: 'json',
+      data: {
+        ...oldDataResp.data,
+        ...values,
+      },
+    });
+  };
+
+  const handleSubmit = async ev => {
+    closeCurrentModal();
+    if (savingTab) {
+      saveTab(ev.detail);
+    }
+    if (editingData) {
+      saveFile(ev.detail);
+    }
+  };
+
+  const handleCopyLink = async ev => {
+    const tabdata = await getTabSaveData(ev.detail);
+    copyTextToClipboard(`${document.location.origin}#tabdata=${encodeURIComponent(JSON.stringify(tabdata))}`);
+  };
+</script>
+
+<FormProvider {initialValues}>
+  <ModalBase {...$$restProps}>
+    <svelte:fragment slot="header">{editingData ? 'Edit favorite' : 'Share / add to favorites'}</svelte:fragment>
+
+    <FormTextField label="Title" name="title" focused />
+    <FormTextField label="Icon" name="icon" />
+
+    <FormTextField label="URL path" name="urlPath" />
+    {#if !!savingTab && !electron && canWriteFavorite}
+      <FormCheckboxField label="Share as link" name="shareAsLink" />
+    {/if}
+    <FormValues let:values>
+      {#if !values.shareAsLink && canWriteFavorite}
+        <FormCheckboxField label="Show in toolbar" name="showInToolbar" />
+        <FormCheckboxField label="Open on startup" name="openOnStartup" />
+      {/if}
+    </FormValues>
+    {#if !!savingTab && !!savedFile}
+      <FormSelectField
+        label="What to save"
+        name="whatToSave"
+        options={[
+          { label: 'Link to file', value: 'fileName' },
+          { label: 'Content', value: 'content' },
+        ]}
+      />
+    {/if}
+
+    <svelte:fragment slot="footer">
+      <FormValues let:values>
+        {#if !values.shareAsLink && canWriteFavorite}
+          <FormSubmit value="OK" on:click={handleSubmit} />
+        {/if}
+        {#if values.shareAsLink || !canWriteFavorite}
+          <FormButton value="Copy link" on:click={handleCopyLink} />
+        {/if}
+        <FormButton value="Cancel" on:click={closeCurrentModal} />
+      </FormValues>
+    </svelte:fragment>
+  </ModalBase>
+</FormProvider>
diff --git a/packages/web/src/stores.ts b/packages/web/src/stores.ts
index 6fb35e8be..2fe726ee9 100644
--- a/packages/web/src/stores.ts
+++ b/packages/web/src/stores.ts
@@ -37,6 +37,7 @@ export const visibleCommandPalette = writable(false);
 export const commands = writable({});
 export const currentTheme = writableWithStorage('theme-light', 'currentTheme');
 export const activeTabId = derived([openedTabs], ([$openedTabs]) => $openedTabs.find(x => x.selected)?.tabid);
+export const activeTab = derived([openedTabs], ([$openedTabs]) => $openedTabs.find(x => x.selected));
 
 export const visibleToolbar = writableWithStorage(1, 'visibleToolbar');
 export const leftPanelWidth = writable(300);
@@ -90,3 +91,9 @@ commands.subscribe(value => {
   }
 });
 export const getCommands = () => commandsValue;
+
+let activeTabValue = null;
+activeTab.subscribe(value => {
+  activeTabValue = value;
+});
+export const getActiveTab = () => activeTabValue;
diff --git a/packages/web/src/widgets/TabsPanel.svelte b/packages/web/src/widgets/TabsPanel.svelte
index 10fd626d6..eb0571f47 100644
--- a/packages/web/src/widgets/TabsPanel.svelte
+++ b/packages/web/src/widgets/TabsPanel.svelte
@@ -83,6 +83,20 @@
     testEnabled: () => getOpenedTabs().filter(x => !x.closedTime).length >= 1,
     onClick: closeAll,
   });
+
+  registerCommand({
+    id: 'tabs.share',
+    category: 'Tabs',
+    name: 'Share',
+    icon: 'icon share',
+    toolbar: true,
+    testEnabled: () =>
+      getActiveTab()?.tabComponent &&
+      tabs[getActiveTab()?.tabComponent] &&
+      tabs[getActiveTab()?.tabComponent].allowAddToFavorites &&
+      tabs[getActiveTab()?.tabComponent].allowAddToFavorites(getActiveTab()?.props),
+    onClick: () => showModal(FavoriteModal, { savingTab: getActiveTab() }),
+  });
 </script>
 
 <script lang="ts">
@@ -90,8 +104,11 @@
   import { derived, get } from 'svelte/store';
   import registerCommand from '../commands/registerCommand';
   import FontIcon from '../icons/FontIcon.svelte';
+  import FavoriteModal from '../modals/FavoriteModal.svelte';
+  import { showModal } from '../modals/modalTools';
 
-  import { currentDatabase, getOpenedTabs, openedTabs } from '../stores';
+  import { currentDatabase, getActiveTab, getOpenedTabs, openedTabs } from '../stores';
+  import tabs from '../tabs';
   import { setSelectedTab } from '../utility/common';
   import contextMenu from '../utility/contextMenu';