diff --git a/CHANGELOG b/CHANGELOG
index accbd2336..07a20304a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ CHANGELOG Roundcube Webmail
 - Fix (replace) application/x-tar file extension test as it might not exist in nginx config (#5253)
 - Fix PHP warning when password_hosts is set, but is not an array (#5260)
 - Fix redundant keep-alive requests when session_lifetime is greater than ~20000 (#5273)
+- Fix so subfolders of INBOX can be set as Archive (#5274)
 
 RELEASE 1.2.0
 -------------
diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js
index f77bedf46..ccf7227ca 100644
--- a/plugins/archive/archive.js
+++ b/plugins/archive/archive.js
@@ -1,6 +1,6 @@
 /**
  * Archive plugin script
- * @version 2.3
+ * @version 2.4
  *
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index ffa309aa6..a472174a0 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -6,7 +6,7 @@
  * Plugin that adds a new button to the mailbox toolbar
  * to move messages to a (user selectable) archive folder.
  *
- * @version 2.3
+ * @version 2.4
  * @license GNU GPLv3+
  * @author Andre Rodier, Thomas Bruederli, Aleksander Machniak
  */
@@ -245,14 +245,22 @@ class archive extends rcube_plugin
       $rcmail = rcmail::get_instance();
 
       // load folders list when needed
-      if ($CURR_SECTION)
-        $select = $rcmail->folder_selector(array('noselection' => '---', 'realnames' => true,
-          'maxlength' => 30, 'exceptions' => array('INBOX'), 'folder_filter' => 'mail', 'folder_rights' => 'w'));
-      else
+      if ($CURR_SECTION) {
+        $select = $rcmail->folder_selector(array(
+            'noselection'   => '---',
+            'realnames'     => true,
+            'maxlength'     => 30,
+            'folder_filter' => 'mail',
+            'folder_rights' => 'w',
+            'onchange'      => "if ($(this).val() == 'INBOX') $(this).val('')",
+        ));
+      }
+      else {
         $select = new html_select();
+      }
 
       $args['blocks']['main']['options']['archive_mbox'] = array(
-          'title' => $this->gettext('archivefolder'),
+          'title'   => $this->gettext('archivefolder'),
           'content' => $select->show($rcmail->config->get('archive_mbox'), array('name' => "_archive_mbox"))
       );
 
diff --git a/plugins/archive/composer.json b/plugins/archive/composer.json
index 0fa3802ea..a79940b58 100644
--- a/plugins/archive/composer.json
+++ b/plugins/archive/composer.json
@@ -3,7 +3,7 @@
     "type": "roundcube-plugin",
     "description": "This adds a button to move the selected messages to an archive folder. The folder (and the optional structure of subfolders) can be selected in the settings panel.",
     "license": "GPLv3+",
-    "version": "2.3",
+    "version": "2.4",
     "authors": [
         {
             "name": "Thomas Bruederli",