diff --git a/css/style.css b/css/style.css
index 0e9494217..437dd095c 100644
--- a/css/style.css
+++ b/css/style.css
@@ -748,6 +748,10 @@ a[href="javascript:;"] {
 #file-n-submit > #qr-file-spoiler {
   margin: 0 2px;
 }
+#file-n-submit input[type='submit'] {
+  -webkit-order: 1;
+  order: 1;
+}
 #qr input[type='file'] {
   position: absolute;
   visibility: hidden;
diff --git a/src/qr.coffee b/src/qr.coffee
index 9f30c5865..843cc4be2 100644
--- a/src/qr.coffee
+++ b/src/qr.coffee
@@ -700,14 +700,14 @@ QR =
         <span id=char-count></span>
       </div>
       <div id=file-n-submit>
+        <input type=submit>
         <input id=qr-file-button type=button value='Choose files'>
         <span id=qr-filename-container>
           <span id=qr-no-file>No selected file</span>
           <span id=qr-filename></span>
         </span>
-        <a id=qr-filerm href=javascript:; title='Remove file' tabindex=-1>×</a>
-        <input type=checkbox id=qr-file-spoiler title='Spoiler image' tabindex=-1>
-        <input type=submit>
+        <a id=qr-filerm href=javascript:; title='Remove file'>×</a>
+        <input type=checkbox id=qr-file-spoiler title='Spoiler image'>
       </div>
       <input type=file multiple>
     </form>