diff --git a/build/index.php b/build/index.php
index 2f12c62..e19f795 100644
--- a/build/index.php
+++ b/build/index.php
@@ -3206,7 +3206,7 @@ register_module([
 
 register_module([
 	"name" => "Page editor",
-	"version" => "0.13.1",
+	"version" => "0.13.2",
 	"author" => "Starbeamrainbowlabs",
 	"description" => "Allows you to edit pages by adding the edit and save actions. You should probably include this one.",
 	"id" => "page-edit",
@@ -3276,10 +3276,10 @@ register_module([
 				$content .= "<p><strong>Warning: You are not logged in! Your IP address <em>may</em> be recorded.</strong></p>";
 			}
 			$content .= "<form method='post' action='index.php?action=save&page=" . rawurlencode($page) . "&action=save' class='editform'>
-			<textarea name='content'>$pagetext</textarea>
-			<input type='text' name='tags' value='$page_tags' placeholder='Enter some tags for the page here. Separate them with commas.' title='Enter some tags for the page here. Separate them with commas.' />
+			<textarea name='content' autofocus tabindex='1'>$pagetext</textarea>
+			<input type='text' name='tags' value='$page_tags' placeholder='Enter some tags for the page here. Separate them with commas.' title='Enter some tags for the page here. Separate them with commas.' tabindex='2' />
 			<p class='editing_message'>$settings->editing_message</p>
-			<input type='submit' value='Save Page' />
+			<input type='submit' value='Save Page' tabindex='3' />
 		</form>";
 			exit(page_renderer::render_main("$title - $settings->sitename", $content));
 		});
diff --git a/module_index.json b/module_index.json
index 674e1f0..0eb2748 100644
--- a/module_index.json
+++ b/module_index.json
@@ -100,11 +100,11 @@
     },
     {
         "name": "Page editor",
-        "version": "0.13.1",
+        "version": "0.13.2",
         "author": "Starbeamrainbowlabs",
         "description": "Allows you to edit pages by adding the edit and save actions. You should probably include this one.",
         "id": "page-edit",
-        "lastupdate": 1460195723,
+        "lastupdate": 1460196076,
         "optional": false
     },
     {
diff --git a/modules/page-edit.php b/modules/page-edit.php
index 0c3a80d..12132ca 100644
--- a/modules/page-edit.php
+++ b/modules/page-edit.php
@@ -1,7 +1,7 @@
 <?php
 register_module([
 	"name" => "Page editor",
-	"version" => "0.13.1",
+	"version" => "0.13.2",
 	"author" => "Starbeamrainbowlabs",
 	"description" => "Allows you to edit pages by adding the edit and save actions. You should probably include this one.",
 	"id" => "page-edit",
@@ -71,10 +71,10 @@ register_module([
 				$content .= "<p><strong>Warning: You are not logged in! Your IP address <em>may</em> be recorded.</strong></p>";
 			}
 			$content .= "<form method='post' action='index.php?action=save&page=" . rawurlencode($page) . "&action=save' class='editform'>
-			<textarea name='content'>$pagetext</textarea>
-			<input type='text' name='tags' value='$page_tags' placeholder='Enter some tags for the page here. Separate them with commas.' title='Enter some tags for the page here. Separate them with commas.' />
+			<textarea name='content' autofocus tabindex='1'>$pagetext</textarea>
+			<input type='text' name='tags' value='$page_tags' placeholder='Enter some tags for the page here. Separate them with commas.' title='Enter some tags for the page here. Separate them with commas.' tabindex='2' />
 			<p class='editing_message'>$settings->editing_message</p>
-			<input type='submit' value='Save Page' />
+			<input type='submit' value='Save Page' tabindex='3' />
 		</form>";
 			exit(page_renderer::render_main("$title - $settings->sitename", $content));
 		});