diff --git a/src/vdirectorytree.cpp b/src/vdirectorytree.cpp
index a20a6ea2..e4059de2 100644
--- a/src/vdirectorytree.cpp
+++ b/src/vdirectorytree.cpp
@@ -103,6 +103,7 @@ void VDirectoryTree::fillTreeItem(QTreeWidgetItem &p_item, const QString &p_name
                                   VDirectory *p_directory, const QIcon &p_icon)
 {
     p_item.setText(0, p_name);
+    p_item.setToolTip(0, p_name);
     p_item.setData(0, Qt::UserRole, QVariant::fromValue(p_directory));
     p_item.setIcon(0, p_icon);
 }
diff --git a/src/vfilelist.cpp b/src/vfilelist.cpp
index 6f307a24..5a6c699d 100644
--- a/src/vfilelist.cpp
+++ b/src/vfilelist.cpp
@@ -142,9 +142,11 @@ void VFileList::fileInfo(VFile *p_file)
 QListWidgetItem* VFileList::insertFileListItem(VFile *file, bool atFront)
 {
     Q_ASSERT(file);
-    QListWidgetItem *item = new QListWidgetItem(file->getName());
+    QString fileName = file->getName();
+    QListWidgetItem *item = new QListWidgetItem(fileName);
     unsigned long long ptr = (long long)file;
     item->setData(Qt::UserRole, ptr);
+    item->setToolTip(fileName);
     Q_ASSERT(sizeof(file) <= sizeof(ptr));
     if (atFront) {
         fileList->insertItem(0, item);
@@ -153,7 +155,7 @@ QListWidgetItem* VFileList::insertFileListItem(VFile *file, bool atFront)
     }
     // Qt seems not to update the QListWidget correctly. Manually force it to repaint.
     fileList->update();
-    qDebug() << "VFileList adds" << file->getName();
+    qDebug() << "VFileList adds" << fileName;
     return item;
 }