diff --git a/src/moin/themes/focus/static/css/theme.css b/src/moin/themes/focus/static/css/theme.css
index afea1fddd..0a82754bd 100644
--- a/src/moin/themes/focus/static/css/theme.css
+++ b/src/moin/themes/focus/static/css/theme.css
@@ -110,6 +110,9 @@ header a:visited, #top-bar a:visited { color: #242424; }
     padding: 0pt 6pt; }
 .moin-form .submit-buttons { display: flex; column-gap: 8pt; justify-content: end;
     margin: 12pt 0;
+    float: right;
+    display: flex;
+    flex-direction: row-reverse;
 }
 .moin-form button, .moin-form input[type="submit"] { clear: none; margin: unset; }
 .moin-form button, .moin-button, .moin-form input[type="submit"] { display: flex;
diff --git a/src/moin/themes/focus/templates/modify.html b/src/moin/themes/focus/templates/modify.html
index 4e4ac1b47..644ef29c0 100644
--- a/src/moin/themes/focus/templates/modify.html
+++ b/src/moin/themes/focus/templates/modify.html
@@ -73,14 +73,14 @@ <h1>{{ title }}</h1>
                         <button class="moin-button" type="button" >{{ _("Load Draft") }}</button>
                         {% set warning = _("Clicking this button will delete draft!") %}
                     {% endif %}
-                    {{ gen.input(type='submit', id='moin-cancel-text-button', name='cancel', value=form.cancel_label,
-                        class='moin-button moin-modify-submit negative', onclick="$('#moin-modify').removeClass('moin-changed-input')",
-                        title=warning) }}
+                    {{ gen.input(type='submit', id='moin-save-text-button', value=form.submit_label,
+                        class='moin-button moin-modify-submit', title=warning, tabindex='-1') }}
                     {{ gen.input(type='submit', id='moin-preview-text-button', name='preview', value=form.preview_label,
                         class='moin-button moin-modify-submit', onclick="$('#moin-modify').removeClass('moin-changed-input')",
                         title=warning) }}
-                    {{ gen.input(type='submit', id='moin-save-text-button', value=form.submit_label,
-                        class='moin-button moin-modify-submit', title=warning) }}
+                    {{ gen.input(type='submit', id='moin-cancel-text-button', name='cancel', value=form.cancel_label,
+                        class='moin-button moin-modify-submit negative', onclick="$('#moin-modify').removeClass('moin-changed-input')",
+                        title=warning) }}
                 </div>
 
             {% endif %}