diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fa94b692..0e36ec55b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+- Added the option `Tab to Choose Files First`, disabled by default.
+
 ## 3.4.0 - *2013-05-06*
 
 - **New feature**: `Archive selection`
diff --git a/src/General/Config.coffee b/src/General/Config.coffee
index 19df555be..a219525ae 100644
--- a/src/General/Config.coffee
+++ b/src/General/Config.coffee
@@ -61,6 +61,7 @@ Config =
       'Hide Original Post Form':      [true,  'Hide the normal post form.']
       'Cooldown':                     [true,  'Indicate the remaining time before posting again.']
       'Cooldown Prediction':          [true,  'Decrease the cooldown time by taking into account upload speed. Disable it if it\'s inaccurate for you.']
+      'Tab to Choose Files First':    [false, 'Tab to the file input before the submit button.']
     'Quote Links':
       'Quote Backlinks':              [true,  'Add quote backlinks.']
       'OP Backlinks':                 [true,  'Add backlinks to the OP.']
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index b0e25f14a..d6bb1d39b 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -819,6 +819,9 @@ QR =
       status:     $ '[type=submit]',     dialog
       fileInput:  $ '[type=file]',       dialog
 
+    if Conf['Tab to Choose Files First']
+      $.add nodes.fileSubmit, nodes.status
+
     # Allow only this board's supported files.
     mimeTypes = $('ul.rules > li').textContent.trim().match(/: (.+)/)[1].toLowerCase().replace /\w+/g, (type) ->
       switch type