diff --git a/program/js/app.js b/program/js/app.js
index b4ef7e244..dc098a2a4 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -7355,7 +7355,8 @@ function rcube_webmail()
   this.show_folder = function(folder, path, force)
   {
     var win, target = window,
-      url = '&_action=edit-folder&_mbox='+urlencode(folder);
+      action = folder === '' ? 'add' : 'edit',
+      url = '&_action=' + action + '-folder&_mbox=' + urlencode(folder);
 
     if (path)
       url += '&_path='+urlencode(path);
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 52797e7d7..00eb08666 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -40,6 +40,7 @@ $RCMAIL->register_action_map(array(
     'unsubscribe'   => 'folders.inc',
     'purge'         => 'folders.inc',
     'folder-size'   => 'folders.inc',
+    'add-folder'    => 'edit_folder.inc',
     'add-identity'  => 'edit_identity.inc',
     'add-response'  => 'edit_response.inc',
     'save-response' => 'edit_response.inc',