diff --git a/src/slic3r/GUI/ImageGrid.cpp b/src/slic3r/GUI/ImageGrid.cpp
index b6755c3e3..aac93edba 100644
--- a/src/slic3r/GUI/ImageGrid.cpp
+++ b/src/slic3r/GUI/ImageGrid.cpp
@@ -295,9 +295,16 @@ void ImageGrid::mouseMoved(wxMouseEvent& event)
     if (hit != std::make_pair(m_hit_type, m_hit_item)) {
         m_hit_type = hit.first;
         m_hit_item = hit.second;
-        if (hit.first == HIT_ITEM)
-            SetToolTip(from_u8(m_file_sys->GetFile(hit.second).Title()));
-        else
+        if (hit.first == HIT_ITEM) {
+            SetToolTip({});
+            auto & file = m_file_sys->GetFile(hit.second);
+            if (auto title = file.Title(); !title.empty()) {
+                auto tip = wxString::Format(_L("File: %s\nTitle: %s\n"), from_u8(file.name), from_u8(title));
+                SetToolTip(tip);
+            } else {
+                SetToolTip(from_u8(file.name));
+            }
+        } else
             SetToolTip({});
         Refresh();
     }
diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
index 230eef70a..42469dd1f 100644
--- a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
+++ b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp
@@ -376,7 +376,7 @@ size_t PrinterFileSystem::GetCount() const
 
 int PrinterFileSystem::File::DownloadProgress() const { return download ? download->progress : !local_path.empty() ? 100 : -2; }
 
-std::string PrinterFileSystem::File::Title() const { return Metadata("Title", name); }
+std::string PrinterFileSystem::File::Title() const { return Metadata("Title", ""); }
 
 std::string PrinterFileSystem::File::Metadata(std::string const &key, std::string const &dflt) const
 {