diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index a296ef16de3205aead4aeab15699868c25f1aed7..a4273501247c5497ea789283f2892ecfaf6794ac 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -2031,9 +2031,10 @@ void EditorManager::updateMakeWritableWarning()
 
 void EditorManager::setupSaveActions(IDocument *document, QAction *saveAction, QAction *saveAsAction, QAction *revertToSavedAction)
 {
-    saveAction->setEnabled(document != 0 && document->isModified());
+    const bool hasFile = document != 0 && !document->filePath().isEmpty();
+    saveAction->setEnabled(hasFile && document->isModified());
     saveAsAction->setEnabled(document != 0 && document->isSaveAsAllowed());
-    revertToSavedAction->setEnabled(document != 0 && !document->filePath().isEmpty());
+    revertToSavedAction->setEnabled(hasFile);
 
     const QString documentName = document ? document->displayName() : QString();
     QString quotedName;
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 9cc2dd82f5fda67f98e82f32a1913c6541bc2896..38e29bfe9820f5dc2f5ceee1f9f2890ca5a328a7 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -317,12 +317,14 @@ void EditorToolBar::listContextMenu(QPoint pos)
                 d->m_editorList->currentIndex());
     QString fileName = entry ? entry->fileName() : QString();
     QString shortFileName = entry ? QFileInfo(fileName).fileName() : QString();
-    if (fileName.isEmpty() || shortFileName.isEmpty())
-        return;
     QMenu menu;
     QAction *copyPath = menu.addAction(tr("Copy Full Path to Clipboard"));
     QAction *copyFileName = menu.addAction(tr("Copy File Name to Clipboard"));
     menu.addSeparator();
+    if (fileName.isEmpty() || shortFileName.isEmpty()) {
+        copyPath->setEnabled(false);
+        copyFileName->setEnabled(false);
+    }
     EditorManager::addSaveAndCloseEditorActions(&menu, entry);
     menu.addSeparator();
     EditorManager::addNativeDirAndOpenWithActions(&menu, entry);