diff --git a/assets/script.js b/assets/script.js
index 3544b9b..ae81c3f 100644
--- a/assets/script.js
+++ b/assets/script.js
@@ -63,8 +63,8 @@ function openEditor() {
     const editor = container.querySelector(".editor");
     const textarea = editor.querySelector('textarea[name="body"]');
     const shadow = editor.querySelector('textarea.shadow-control');
-    const form = editor.querySelector("form");
-    const cancel = editor.querySelector('.cancel');
+    const form = document.getElementById('article-editor');
+    const cancel = form.querySelector('.cancel');
 
     const footer = document.querySelector("footer");
     const lastUpdated = footer.querySelector(".last-updated");
diff --git a/assets/style.css b/assets/style.css
index f04ff1f..8f28c9d 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -78,14 +78,11 @@ article>hr {
 
     /* Hack to force containing the children instead of collapsing marigins */
     border: 1px solid var(--theme-main);
-
-    box-shadow: 0 5px 20px rgba(0, 0, 0, 0.2);
 }
 
 .search-container {
     background: var(--theme-main);
     color: var(--theme-text);
-    z-index: 1;
 }
 
 header, article>*, .search {
@@ -209,8 +206,6 @@ footer {
         "Segoe UI", "Roboto", "Oxygen",
         "Ubuntu", "Cantarell", "Fira Sans",
         "Droid Sans", "Helvetica Neue", sans-serif;
-
-    box-shadow: 0 5px 20px rgba(0, 0, 0, 0.2);
 }
 
 footer a {
@@ -306,19 +301,41 @@ h1>input {
     bottom: 0;
     left: 0;
 
+    box-shadow: 0px 5px 20px rgba(0,0,0, 0.2);
+
     background: var(--theme-main);
     color: var(--theme-text);
     padding: 10px 20px;
+
+    transform: translate(0, 65px);
+    transition: transform 100ms;
+    transition-timing-function: linear;
+}
+
+.edit .editor-controls {
+    transform: translate(0, 0);
+    transition-timing-function: cubic-bezier(.17,.84,.44,1);
 }
 
 @media (min-width: 630px) {
     .editor-controls {
         position: fixed;
-        left: auto;
-        right: 20px;
-        bottom: 20px;
+        left: calc(50vw + 320px);
+        width: 120px;
+        top: calc(50vh - 40px);
+        height: 80px;
 
-        box-shadow: 2px 2px 8px rgba(0,0,0, 0.25);
+        transform: translate(20px, 0);
+        opacity: 0;
+
+        transition: transform 100ms, opacity 100ms;
+        transition-timing-function: linear;
+    }
+
+    .edit .editor-controls {
+        transform: translate(0, 0);
+        transition-timing-function: cubic-bezier(.17,.84,.44,1);
+        opacity: 1;
     }
 }
 
@@ -484,7 +501,7 @@ input[type="search"] {
 
     text-align: center;
     background: #eee;
-    box-shadow: 2px 2px 8px rgba(0,0,0, 0.25);
+    box-shadow: 0px 5px 20px rgba(0,0,0, 0.2);
 }
 
 .popup>.message {
@@ -542,7 +559,6 @@ input[type="search"] {
 
         /* Disable hack to force containing the children instead of collapsing marigins */
         border: none;
-        box-shadow: none;
     }
 
     h1, h2, h3, h4, h5, h6 {
diff --git a/templates/article.html b/templates/article.html
index 05bf03e..a1b050f 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -5,10 +5,10 @@
 {{>article_contents.html}}
 </div>
 
-<div class="editor">
-<form action="" method="POST">
+<form id="article-editor" action="" method="POST">
 
-<div class="hero" style="z-index: -1">
+<div class="editor">
+<div class="hero">
 <header>
 <h1><input autocomplete=off type=text name=title value="{{title}}" placeholder="Title" required></h1>
 </header>
@@ -22,15 +22,16 @@
 </p>
 </article>
 
+</div>
+
 <div class="editor-controls">
 {{#cancel_url}}
     <a class="cancel" href="{{.}}">Cancel</a>
 {{/cancel_url}}
     <button type=submit>Save</button>
 </div>
-
 </form>
-</div>
+
 </div>
 
 <footer>