diff --git a/lib/gollum/public/gollum/javascript/gollum.js.erb b/lib/gollum/public/gollum/javascript/gollum.js.erb
index 2cfbb1f9..417bb6a9 100755
--- a/lib/gollum/public/gollum/javascript/gollum.js.erb
+++ b/lib/gollum/public/gollum/javascript/gollum.js.erb
@@ -380,8 +380,12 @@ $(document).ready(function() {
       active_tab = '#edit.tabnav-tab';
     }
 
+    $('.tabnav-tab.selected').removeAttr('aria-current');
     $('.tabnav-tab.selected').removeClass('selected');
+
+    $(active_tab).attr('aria-current', 'page');
     $(active_tab).addClass('selected');
+
     $('.tabnav-div').hide();
     $(active_div).show();
   }
diff --git a/lib/gollum/templates/create.mustache b/lib/gollum/templates/create.mustache
index 4c4dae7e..53793b29 100644
--- a/lib/gollum/templates/create.mustache
+++ b/lib/gollum/templates/create.mustache
@@ -4,13 +4,15 @@
   <h1 class="py-4">Create New Page</h1>
 </div>
 <div id="wiki-content" class="create edit">
-	<div class="tabnav">
-	  <nav class="tabnav-tabs" aria-label="Foo bar">
-	    <a href="#" id="edit" class="tabnav-tab selected" aria-current="edit">Edit</a>
-	    <a href="#" id="preview" class="tabnav-tab" aria-current="preview">Preview</a>
-	  </nav>
-	</div>
-	
+  <div class="tabnav">
+    <nav class="tabnav-tabs" aria-label="Toggle edit or preview mode">
+      <a href="#" id="edit" class="tabnav-tab selected" aria-current="page">
+        Edit
+      </a>
+      <a href="#" id="preview" class="tabnav-tab">Preview</a>
+    </nav>
+  </div>
+
   <div class="has-sidebar tabnav-div" id="edit-content">
     {{>editor}}
   </div>
diff --git a/lib/gollum/templates/edit.mustache b/lib/gollum/templates/edit.mustache
index b7b0be2b..c85b2800 100644
--- a/lib/gollum/templates/edit.mustache
+++ b/lib/gollum/templates/edit.mustache
@@ -5,8 +5,10 @@
 </div>
 <div class="tabnav">
   <nav class="tabnav-tabs">
-    <a href="#" id="edit" class="tabnav-tab selected" aria-current="edit">Edit</a>
-    <a href="#" id="preview" class="tabnav-tab" aria-current="preview">Preview</a>
+    <a href="#" id="edit" class="tabnav-tab selected" aria-current="page">
+      Edit
+    </a>
+    <a href="#" id="preview" class="tabnav-tab">Preview</a>
   </nav>
 </div>
   <div class="tabnav-div" id="edit-content">{{>editor}}</div>