diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp
index ef6f3ede..b00ee4a4 100644
--- a/src/document/UBDocumentController.cpp
+++ b/src/document/UBDocumentController.cpp
@@ -803,7 +803,19 @@ void UBDocumentController::deleteSelectedItem()
                                                       tr("Are you sure you want to remove all selected documents?")))
             return;
 
+        QList<QTreeWidgetItem*> foldersToDelete;
+
         foreach (QTreeWidgetItem * item, mCurrentSelection) {
+            LastSelectedElementType type = itemType(item);
+            if (type == Document)
+                deleteTreeItem(item, false);
+
+            else if (type == Folder)
+                // Delete folders later, to avoid deleting a document twice
+                foldersToDelete << item;
+        }
+
+        foreach (QTreeWidgetItem * item, foldersToDelete) {
             deleteTreeItem(item, false);
         }
     }
@@ -1824,3 +1836,16 @@ bool UBDocumentController::multipleSelection()
    QList<QTreeWidgetItem*> items = mDocumentUI->documentTreeWidget->selectedItems();
    return (items.size() > 1);
 }
+
+UBDocumentController::LastSelectedElementType UBDocumentController::itemType(QTreeWidgetItem * item)
+{
+    UBDocumentProxyTreeItem * document = dynamic_cast<UBDocumentProxyTreeItem*>(item);
+    if (document)
+        return Document;
+
+    UBDocumentGroupTreeItem * folder = dynamic_cast<UBDocumentGroupTreeItem*>(item);
+    if (folder)
+        return Folder;
+
+    return None;
+}
diff --git a/src/document/UBDocumentController.h b/src/document/UBDocumentController.h
index a946f0fe..fc28af0c 100644
--- a/src/document/UBDocumentController.h
+++ b/src/document/UBDocumentController.h
@@ -135,6 +135,7 @@ class UBDocumentController : public UBDocumentContainer
         bool multipleSelection();
         bool isDocumentInTrash(UBDocumentProxyTreeItem * document);
         bool isCurrentSelectionInTrash();
+        LastSelectedElementType itemType(QTreeWidgetItem * item);
 
     private slots:
         void documentZoomSliderValueChanged (int value);