diff --git a/plugins/volume_format_fs/volume_format.cs b/plugins/volume_format_fs/volume_format.cs
index bda6d19..0165d67 100644
--- a/plugins/volume_format_fs/volume_format.cs
+++ b/plugins/volume_format_fs/volume_format.cs
@@ -16,27 +16,24 @@
 	<?cs call:print_form_header("set_type", "volume_format_fs") ?>
 	<table border="0">
 	<tr>
-	</tr><tr>
 		<td>
 			<label for="fs_type"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.FSType)
 			?>: </label>
 		</td>
 		<td>
-			<select name="fs_type" id="fs_type" size="0">
+			<select name="fs_type" tabindex="1" id="fs_type" size="0">
 				<?cs each:x = Data.Plugins.volume_format_fs.fs_types ?>
 					<option <?cs if:x == "windows" ?>selected="selected"<?cs /if ?>><?cs var:html_escape(x) ?></option><?cs /each ?>
 				</select>
 		</td>
 		<td><?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Filesystem) ?></td>
-	</tr>
-	<tr>
 	</tr><tr>
 		<td>
 			<p><label for="container_type"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.IsEncrypted)
 		?>: </label>
 		</td>
 		<td>
-			<select name="container_type" id="container_type">
+			<select name="container_type" tabindex="2" id="container_type">
 			<option value="luks" <?cs if:Data.Plugins.volume_format_fs.container_type != "plain" ?>selected="selected"<?cs /if ?>><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.Yes) ?></option>
 			<option value="plain" <?cs if:Data.Plugins.volume_format_fs.container_type == "plain" ?>selected="selected"<?cs /if ?>><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.No) ?></option>
 			</select>
@@ -44,18 +41,18 @@
 		<td><?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Encryption) ?></td>
 	</tr><tr>
 		<td colspan="2">
-			<input type="checkbox" name="confirm" value="1" id="confirm" /><label for="confirm"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.Confirm) ?></label>
+			<input type="checkbox" name="confirm" tabindex="3" value="1" id="confirm" /><label for="confirm"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.Confirm) ?></label>
 			<input type="hidden" name="device" value="<?cs var:Data.CurrentDisk.device ?>" />
 			<input type="hidden" name="store" value="step1" />
 		</td>
 		<td><?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Confirm) ?></td>
 	</tr><tr>
 		<td colspan="3">	
-			<button type="submit"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Button.Format) ?></button>
+			<button type="submit" tabindex="4" ><?cs var:html_escape(Lang.Plugins.volume_format_fs.Button.Format) ?></button>
 		</td>
 	</tr>
-	</form>
 	</table>
+	</form>
 
 <?cs /if ?>
 </fieldset>
diff --git a/plugins/volume_format_fs/volume_format_luks.cs b/plugins/volume_format_fs/volume_format_luks.cs
index ac7a6dd..790b0b1 100644
--- a/plugins/volume_format_fs/volume_format_luks.cs
+++ b/plugins/volume_format_fs/volume_format_luks.cs
@@ -23,13 +23,13 @@
 			var:html_escape(Lang.Plugins.volume_format_fs.Text.No) ?><?cs /if ?></p>
 
 		<?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Password) ?>
-		<p><label for="crypto_password"><?cs var:html_escape(Lang.Text.EnterNewPassword) ?>: </label> <input type="password" id="crypto_password" name="crypto_password" /></p>
-		<p><label for="crypto_password2"><?cs var:html_escape(Lang.Text.EnterSamePassword) ?>: </label> <input type="password" id="crypto_password2" name="crypto_password2" /></p>
+		<p><label for="crypto_password"><?cs var:html_escape(Lang.Text.EnterNewPassword) ?>: </label> <input type="password" id="crypto_password" tabindex="1" name="crypto_password" /></p>
+		<p><label for="crypto_password2"><?cs var:html_escape(Lang.Text.EnterSamePassword) ?>: </label> <input type="password" id="crypto_password2" tabindex="2" name="crypto_password2" /></p>
 		<p><input type="hidden" name="device" value="<?cs var:Data.CurrentDisk.device ?>" />
 		<input type="hidden" name="fs_type" value="<?cs var:html_escape(Data.Plugins.volume_format_fs.fs_type) ?>" />
 		<input type="hidden" name="container_type" value="<?cs var:html_escape(Data.Plugins.volume_format_fs.container_type) ?>" />
 		<input type="hidden" name="store" value="step2" />
-		<button type="submit"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Button.Format) ?></button></p>
+		<button type="submit" tabindex="3" ><?cs var:html_escape(Lang.Plugins.volume_format_fs.Button.Format) ?></button></p>
 	</form>
 
 <?cs /if ?>