diff --git a/src/UI/ScriptDocumentView.cc b/src/UI/ScriptDocumentView.cc
index 80742397de60fb6b6d96aa4cddc4fe9b33d507b9..dc6cf044504e5a3ff0ccc802135e95ac1943659a 100644
--- a/src/UI/ScriptDocumentView.cc
+++ b/src/UI/ScriptDocumentView.cc
@@ -31,13 +31,15 @@ ScriptDocumentView::closeDocument() noexcept
 QString
 ScriptDocumentView::getDocumentTabName() const noexcept
 {
-    return "VS File";
+    const QFileInfo fileInfo(document->getName());
+    return fileInfo.completeBaseName();
 }
 
 QString
 ScriptDocumentView::getDocumentTabToolTip() const noexcept
 {
-    return "VS File";
+    return QStringLiteral("UUID: ") + document->getUuid().toString() +
+           QStringLiteral("\nType: Vivy Script");
 }
 
 QIcon
diff --git a/src/UI/VivyDocumentView.cc b/src/UI/VivyDocumentView.cc
index cd72d6f7ba4201f847b3635dd7b8b5cabd4374ee..64213d65f39dd15677361015d4c99e6c8d5e7b50 100644
--- a/src/UI/VivyDocumentView.cc
+++ b/src/UI/VivyDocumentView.cc
@@ -64,10 +64,12 @@ VivyDocumentView::getDocumentTabName() const noexcept
 QString
 VivyDocumentView::getDocumentTabToolTip() const noexcept
 {
-    return "UUID: " + document->getUuid().toString() + "\nCapabilities: [" +
-           document->getDocumentCapabilitiesString() + "]" +
-           (document->checkDocumentOption(VivyDocument::UntouchedByDefault) ? "\nUntouched document"
-                                                                            : "");
+    return QStringLiteral("UUID: ") + document->getUuid().toString() +
+           QStringLiteral("\nType: Vivy Document {") + document->getDocumentCapabilitiesString() +
+           QStringLiteral("}") +
+           (document->checkDocumentOption(VivyDocument::UntouchedByDefault)
+                ? QStringLiteral("\nUntouched document")
+                : QStringLiteral(""));
 }
 
 void