diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 32c9bed5..c88b019c 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -96,14 +96,21 @@
           :show-pin="editMode || forceEditMode"
           :item="item"
         />
-        <div
+        <li
           v-if="!forceEditMode && currentUser"
-          class="panel-footer"
         >
-          <Checkbox v-model="editMode">
-            {{ $t('nav.edit_pinned') }}
-          </Checkbox>
-        </div>
+          <button
+            class="menu-item button-unstyled"
+            @click="toggleEditMode"
+          >
+            <FAIcon
+              fixed-width
+              class="fa-scale-110"
+              :icon="editMode ? 'check' : 'wrench'"
+            />
+            {{ editMode ? $t('nav.edit_finish') : $t('nav.edit_pinned') }}
+          </button>
+        </li>
       </ul>
     </div>
   </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 68bf883a..8d61ba72 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -156,7 +156,8 @@
     "chats": "Chats",
     "lists": "Lists",
     "edit_nav_mobile": "Customize navigation bar",
-    "edit_pinned": "Edit pinned items"
+    "edit_pinned": "Edit pinned items",
+    "edit_finish": "Done editing"
   },
   "notifications": {
     "broken_favorite": "Unknown status, searching for it…",