diff --git a/ChangeLog b/ChangeLog
index 0724fcfa8..e2efdfae7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,7 @@
 39. Add original date to playlist table columns.
 40. Add option to use 'Original Year' to display and sort albums.
 41. Sort folder view items, as MPD does not seem to sort playlist names.
+42. In folder view, allow to add folders and files at the same time.
 
 2.2.0
 -----
diff --git a/gui/folderpage.cpp b/gui/folderpage.cpp
index 5dc97f112..471587549 100644
--- a/gui/folderpage.cpp
+++ b/gui/folderpage.cpp
@@ -105,15 +105,11 @@ void FolderPage::controlActions()
         } else {
             trackSelected=true;
         }
-        if (folderSelected && trackSelected) {
-            enable=false;
-            break;
-        }
     }
 
     StdActions::self()->enableAddToPlayQueue(enable);
     StdActions::self()->addToStoredPlaylistAction->setEnabled(enable);
-    bool fileActions = enable && trackSelected && MPDConnection::self()->getDetails().dirReadable;
+    bool fileActions = trackSelected && !folderSelected && MPDConnection::self()->getDetails().dirReadable;
     CustomActions::self()->setEnabled(fileActions);
     #ifdef TAGLIB_FOUND
     StdActions::self()->organiseFilesAction->setEnabled(fileActions);