diff --git a/app/view/templates/homemenu.php b/app/view/templates/homemenu.php
index b3ec98eb..322b8cfc 100644
--- a/app/view/templates/homemenu.php
+++ b/app/view/templates/homemenu.php
@@ -523,6 +523,9 @@
                 <?php endif ?>
             </div>
         </details>
+    </div>
+
+    <div class="hbar-section">
 
         <div id="save-workspace">
             <form
diff --git a/app/view/templates/mediamenu.php b/app/view/templates/mediamenu.php
index 2a55690c..06df6afe 100644
--- a/app/view/templates/mediamenu.php
+++ b/app/view/templates/mediamenu.php
@@ -142,6 +142,9 @@
                 </form>
             </div>
         </details>
+    </div>
+
+    <div class="hbar-section">
 
         <div id="save-workspace">
             <form
diff --git a/assets/css/base.css b/assets/css/base.css
index 8e1fe4f0..33cfa684 100644
--- a/assets/css/base.css
+++ b/assets/css/base.css
@@ -18,7 +18,6 @@ topbar
 navbar 
 toggle panels (collapsibles) 
 delete 
-workspace button (no-js) 
 media queries 
 flash messages 
 
@@ -492,14 +491,6 @@ input.toggle-panel-toggle {
     padding: var(--spacing);
 }
 
-/* --------------------------------------------------------- workspace button (no-js) */
-#save-workspace {
-    position: absolute;
-    right: var(--spacing);
-}
-.js #save-workspace {
-    display: none;
-}
 /* --------------------------------------------------------- media queries */
 
 
diff --git a/src/fn/fn.js b/src/fn/fn.js
index 0bde7f6a..ff09e001 100644
--- a/src/fn/fn.js
+++ b/src/fn/fn.js
@@ -91,11 +91,9 @@ export function initWorkspaceForm() {
     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';
-        }
+    let saveworkspace = document.getElementById('save-workspace');
+    if (saveworkspace instanceof HTMLElement) {
+        saveworkspace.style.display = 'none';
     }
 
     form.addEventListener('submit', function(event) {