diff --git a/novelwriter/gui/projtree.py b/novelwriter/gui/projtree.py
index 434c5852..5faa85b2 100644
--- a/novelwriter/gui/projtree.py
+++ b/novelwriter/gui/projtree.py
@@ -1251,18 +1251,30 @@ class GuiProjectTree(QTreeWidget):
             isDocFile = isFile and tItem.isDocumentLayout()
             isNoteFile = isFile and tItem.isNoteLayout()
 
-            if (isNoteFile or isFolder) and tItem.documentAllowed():
+            if isNoteFile and tItem.documentAllowed():
                 aConvert1 = mTrans.addAction(self.tr("Convert to {0}").format(trDoc))
                 aConvert1.triggered.connect(
                     lambda: self._changeItemLayout(tHandle, nwItemLayout.DOCUMENT)
                 )
 
-            if isDocFile or isFolder:
+            if isDocFile:
                 aConvert2 = mTrans.addAction(self.tr("Convert to {0}").format(trNote))
                 aConvert2.triggered.connect(
                     lambda: self._changeItemLayout(tHandle, nwItemLayout.NOTE)
                 )
 
+            if isFolder and tItem.documentAllowed():
+                aConvert3 = mTrans.addAction(self.tr("Convert to {0}").format(trDoc))
+                aConvert3.triggered.connect(
+                    lambda: self._covertFolderToFile(tHandle, nwItemLayout.DOCUMENT)
+                )
+
+            if isFolder:
+                aConvert4 = mTrans.addAction(self.tr("Convert to {0}").format(trNote))
+                aConvert4.triggered.connect(
+                    lambda: self._covertFolderToFile(tHandle, nwItemLayout.NOTE)
+                )
+
             if hasChild and isFile:
                 aMerge1 = mTrans.addAction(self.tr("Merge Child Items into Self"))
                 aMerge1.triggered.connect(lambda: self._mergeDocuments(tHandle, False))
diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py
index 019539bb..4b89e03b 100644
--- a/novelwriter/guimain.py
+++ b/novelwriter/guimain.py
@@ -610,6 +610,7 @@ class GuiMain(QMainWindow):
             logger.debug("Requested item '%s' is not a document", tHandle)
             return False
 
+        self._changeView(nwView.EDITOR)
         cHandle = self.docEditor.docHandle()
         if cHandle == tHandle:
             self.docEditor.setCursorLine(tLine)
@@ -618,7 +619,6 @@ class GuiMain(QMainWindow):
             return True
 
         self.closeDocument(beforeOpen=True)
-        self._changeView(nwView.EDITOR)
         if self.docEditor.loadText(tHandle, tLine):
             self.theProject.data.setLastHandle(tHandle, "editor")
             self.projView.setSelectedHandle(tHandle, doScroll=doScroll)