diff --git a/app/view/templates/homemenu.php b/app/view/templates/homemenu.php
index 675326e0..b9023846 100644
--- a/app/view/templates/homemenu.php
+++ b/app/view/templates/homemenu.php
@@ -442,7 +442,12 @@
 
     <span id="save-workspace">
 
-<form action="<?= $this->url('workspaceupdate') ?>" method="post" id="workspace-form">
+<form
+    action="<?= $this->url('workspaceupdate') ?>"
+    method="post"
+    data-api="<?= $this->url('apiworkspaceupdate') ?>"
+    id="workspace-form"
+>
     <input type="hidden" name="showeoptionspanel" value="0">
     <button type="submit">
         <i class="fa fa-edit"></i>
diff --git a/assets/css/home.css b/assets/css/home.css
index 4bfd848b..3bc3c76a 100644
--- a/assets/css/home.css
+++ b/assets/css/home.css
@@ -2,10 +2,6 @@ aside #edit input[type="submit"] {
     width: 100%;
 }
 
-section.bookmarks {
-    min-width: 2em;
-}
-
 .bookmarks .block {
     height: 100%;
 }
diff --git a/src/edit.js b/src/edit.js
index 246e71fc..05e7f77e 100644
--- a/src/edit.js
+++ b/src/edit.js
@@ -18,6 +18,7 @@ import icon from 'leaflet/dist/images/marker-icon.png';
 import icon_2x from 'leaflet/dist/images/marker-icon-2x.png';
 import shadow from 'leaflet/dist/images/marker-shadow.png';
 import * as L from 'leaflet';
+import { initWorkspaceForm, submitHandler } from './fn/fn';
 
 /* ________________ LEAFLET ________________ */
 
@@ -245,25 +246,6 @@ function initForm() {
     });
 }
 
-function initWorkspaceForm() {
-    let form = document.getElementById('workspace-form');
-    let inputs = form.elements;
-    for (const input of inputs) {
-        input.oninput = workspaceChanged;
-    }
-    let submits = form.querySelectorAll('[type="submit"]');
-    for (const submit of submits) {
-        if (submit instanceof HTMLElement) {
-            submit.style.display = 'none';
-        }
-    }
-
-    form.addEventListener('submit', function(event) {
-        event.preventDefault();
-        submitHandler(this, noop);
-    });
-}
-
 function initEditors(theme) {
     // disable CodeMirror's default ctrl+D shortcut (delete line)
     delete CodeMirror.keyMap['default']['Ctrl-D'];
@@ -474,28 +456,6 @@ function themeChangeHandler(e) {
     theme = e.target.value;
 }
 
-/**
- * Manage submit event
- * @param {HTMLFormElement} form
- */
-function submitHandler(form, onSuccess) {
-    var xhr = new XMLHttpRequest();
-    var fd = new FormData(form);
-
-    xhr.addEventListener('load', function(event) {
-        if (httpOk(xhr.status)) {
-            onSuccess(xhr.response);
-        } else {
-            alert('Error while trying to update: ' + xhr.statusText);
-        }
-    });
-    xhr.addEventListener('error', function(event) {
-        alert('Network error while trying to update.');
-    });
-    xhr.open(form.method, form.dataset.api);
-    xhr.send(fd);
-}
-
 /**
  * Manage a beforeUnloadEvent
  * @param {BeforeUnloadEvent} e
@@ -522,21 +482,3 @@ function saved(data) {
 function onSuccess(response) {
     saved(JSON.parse(response));
 }
-
-/**
- * @param {InputEvent} e
- */
-function workspaceChanged(e) {
-    let elem = e.target;
-    elem.form.requestSubmit();
-}
-
-/**
- * Check if an HTTP response status indicates a success.
- * @param {number} status
- */
-function httpOk(status) {
-    return status >= 200 && status < 300;
-}
-
-function noop() {}
diff --git a/src/fn/fn.js b/src/fn/fn.js
index 69cbe2a2..0e304d06 100644
--- a/src/fn/fn.js
+++ b/src/fn/fn.js
@@ -74,3 +74,61 @@ export function activateSelectAll() {
         selectAllInput.addEventListener('click', selectAll);
     }
 }
+
+/**
+ * Manage submit event for a given form
+ * @param {HTMLFormElement} form
+ * @param {(response: any) => void} onSuccess
+ */
+export function submitHandler(form, onSuccess = () => {}) {
+    var xhr = new XMLHttpRequest();
+    var fd = new FormData(form);
+
+    xhr.addEventListener('load', function(event) {
+        if (httpOk(xhr.status)) {
+            onSuccess(xhr.response);
+        } else {
+            alert('Error while trying to update: ' + xhr.statusText);
+        }
+    });
+    xhr.addEventListener('error', function(event) {
+        alert('Network error while trying to update.');
+    });
+    xhr.open(form.method, form.dataset.api);
+    xhr.send(fd);
+}
+
+/**
+ * Check if an HTTP response status indicates a success.
+ * @param {number} status
+ */
+function httpOk(status) {
+    return status >= 200 && status < 300;
+}
+
+export function initWorkspaceForm() {
+    let form = document.getElementById('workspace-form');
+    let inputs = form.elements;
+    for (const input of inputs) {
+        input.oninput = workspaceChanged;
+    }
+    let submits = form.querySelectorAll('[type="submit"]');
+    for (const submit of submits) {
+        if (submit instanceof HTMLElement) {
+            submit.style.display = 'none';
+        }
+    }
+
+    form.addEventListener('submit', function(event) {
+        event.preventDefault();
+        submitHandler(this);
+    });
+}
+
+/**
+ * @param {InputEvent} e
+ */
+function workspaceChanged(e) {
+    let elem = e.target;
+    elem.form.requestSubmit();
+}
diff --git a/src/home.js b/src/home.js
index a75ba1d9..8b29fb5b 100644
--- a/src/home.js
+++ b/src/home.js
@@ -2,10 +2,12 @@ import {
     activateCheckall,
     activateCloseSubmenus,
     activateSelectAll,
+    initWorkspaceForm,
 } from './fn/fn';
 
 window.addEventListener('load', () => {
     activateCheckall('pagesid[]', 'checkall');
     activateSelectAll();
     activateCloseSubmenus();
+    initWorkspaceForm();
 });