diff --git a/assets/page.html b/assets/page.html
index acfbc44..7f54f9f 100644
--- a/assets/page.html
+++ b/assets/page.html
@@ -15,11 +15,16 @@
                 {{range .Crumbs}}<span class="sep">/</span
                 ><a href="{{.URL}}">{{.Name}}</a>{{end}}
             </nav>
-            {{if .CanEdit}}<a class="edit-btn" href="?edit" title="Edit (E)">EDIT</a>{{end}}
+            {{if .EditMode}}
+            <a class="btn-cancel" href="{{.PostURL}}">CANCEL</a>
+            <button class="btn-save" type="submit" form="edit-form" data-action="save" data-key="S" title="Save (S)">SAVE</button>
+            {{else if .CanEdit}}
+            <a class="edit-btn" href="?edit" title="Edit (Alt+Shift+E)">EDIT</a>
+            {{end}}
         </header>
         <main>
             {{if .EditMode}}
-            <form class="edit-form" method="POST" action="{{.PostURL}}">
+            <form id="edit-form" class="edit-form" method="POST" action="{{.PostURL}}">
                 <div class="editor-toolbar">
                     <button type="button" class="btn-tool" data-action="bold"      data-key="B" title="Bold (B)">**</button>
                     <button type="button" class="btn-tool" data-action="italic"    data-key="I" title="Italic (I)">*</button>
@@ -38,10 +43,6 @@
                     <button type="button" class="btn-tool" data-action="hr"        data-key="R" title="Horizontal rule (R)">---</button>
                 </div>
                 <textarea name="content" id="editor" autofocus>{{.RawContent}}</textarea>
-                <div class="form-actions">
-                    <a class="btn-cancel" href="{{.PostURL}}">CANCEL</a>
-                    <button class="btn-save" type="submit" data-action="save" data-key="S" title="Save (S)">SAVE</button>
-                </div>
             </form>
             <script src="/_/editor.js"></script>
             {{else}} {{if .Content}}
diff --git a/assets/style.css b/assets/style.css
index 5b7be5a..e2c28ba 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -303,12 +303,6 @@ textarea:focus {
     box-shadow: 0 0 5px #0a0;
 }
 
-.form-actions {
-    display: flex;
-    gap: 0.75rem;
-    justify-content: flex-end;
-}
-
 .btn-save {
     background: none;
     border: none;