diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp
index 2d1fd879c9a..ea08e90900b 100644
--- a/src/plugins/clangcodemodel/test/clangdtests.cpp
+++ b/src/plugins/clangcodemodel/test/clangdtests.cpp
@@ -772,7 +772,7 @@ void ClangdTestTooltips::test()
 
     TextEditor::TextDocument * const doc = document("tooltips.cpp");
     QVERIFY(doc);
-    const auto editor = qobject_cast<TextEditor::BaseTextEditor *>(EditorManager::currentEditor());
+    const auto editor = TextEditor::BaseTextEditor::currentTextEditor();
     QVERIFY(editor);
     QCOMPARE(editor->document(), doc);
     QVERIFY(editor->editorWidget());
diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp
index 9f62de9e09a..f5c04a4a5f1 100644
--- a/src/plugins/classview/classviewmanager.cpp
+++ b/src/plugins/classview/classviewmanager.cpp
@@ -371,8 +371,7 @@ void Manager::gotoLocations(const QList<QVariant> &list)
     if (locations.size() > 1) {
         // The symbol has multiple locations. Check if we are already at one location,
         // and if so, cycle to the "next" one
-        auto textEditor = qobject_cast<TextEditor::BaseTextEditor *>(EditorManager::currentEditor());
-        if (textEditor) {
+        if (auto textEditor = TextEditor::BaseTextEditor::currentTextEditor()) {
             // check if current cursor position is a known location of the symbol
             const FilePath filePath = textEditor->document()->filePath();
             int line;
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index cb785f3a5fc..a6a0e6d35cc 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -85,8 +85,8 @@ void EditMode::grabEditorManager(Utils::Id mode)
     if (mode != id())
         return;
 
-    if (EditorManager::currentEditor())
-        EditorManager::currentEditor()->widget()->setFocus();
+    if (IEditor *editor = EditorManager::currentEditor())
+        editor->widget()->setFocus();
 }
 
 } // namespace Core::Internal
diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
index 007a2c84cf7..97297b0e904 100644
--- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
+++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
@@ -42,7 +42,6 @@
 #include <QTreeView>
 
 #include <algorithm>
-#include <numeric>
 
 using namespace CPlusPlus;
 using namespace Utils;
@@ -57,14 +56,9 @@ template <class T> void resizeColumns(QTreeView *view)
         view->resizeColumnToContents(column);
 }
 
-TextEditor::BaseTextEditor *currentEditor()
-{
-    return qobject_cast<TextEditor::BaseTextEditor*>(Core::EditorManager::currentEditor());
-}
-
 FilePath fileInCurrentEditor()
 {
-    if (TextEditor::BaseTextEditor *editor = currentEditor())
+    if (auto editor = TextEditor::BaseTextEditor::currentTextEditor())
         return editor->document()->filePath();
     return {};
 }
@@ -1660,9 +1654,8 @@ void CppCodeModelInspectorDialog::refresh()
     m_snapshotSelector->addItem(globalSnapshotTitle);
     dumper.dumpSnapshot(globalSnapshot, globalSnapshotTitle, /*isGlobalSnapshot=*/ true);
 
-    TextEditor::BaseTextEditor *editor = currentEditor();
     CppEditorDocumentHandle *cppEditorDocument = nullptr;
-    if (editor) {
+    if (auto editor = TextEditor::BaseTextEditor::currentTextEditor()) {
         const FilePath editorFilePath = editor->document()->filePath();
         cppEditorDocument = CppModelManager::cppEditorDocument(editorFilePath);
         if (auto documentProcessor = CppModelManager::cppEditorDocumentProcessor(editorFilePath)) {
diff --git a/src/plugins/cppeditor/cppincludehierarchy.cpp b/src/plugins/cppeditor/cppincludehierarchy.cpp
index 7802bb9b17d..22cd75c0ce1 100644
--- a/src/plugins/cppeditor/cppincludehierarchy.cpp
+++ b/src/plugins/cppeditor/cppincludehierarchy.cpp
@@ -406,7 +406,7 @@ void CppIncludeHierarchyWidget::perform()
 {
     showNoIncludeHierarchyLabel();
 
-    m_editor = qobject_cast<BaseTextEditor *>(EditorManager::currentEditor());
+    m_editor = BaseTextEditor::currentTextEditor();
     if (!m_editor)
         return;
 
@@ -471,7 +471,7 @@ void CppIncludeHierarchyWidget::syncFromEditorManager()
     if (!m_toggleSync->isChecked())
         return;
 
-    const auto editor = qobject_cast<BaseTextEditor *>(EditorManager::currentEditor());
+    const auto editor = BaseTextEditor::currentTextEditor();
     if (!editor)
         return;
 
diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp
index ab4bc0525e8..418c466e8d3 100644
--- a/src/plugins/cppeditor/cpptypehierarchy.cpp
+++ b/src/plugins/cppeditor/cpptypehierarchy.cpp
@@ -221,7 +221,7 @@ void CppTypeHierarchyWidget::perform()
 
     m_showOldClass = false;
 
-    auto editor = qobject_cast<TextEditor::BaseTextEditor *>(Core::EditorManager::currentEditor());
+    auto editor = TextEditor::BaseTextEditor::currentTextEditor();
     if (!editor) {
         showNoTypeHierarchyLabel();
         return;
diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp
index afe08e2d1fe..b176ec14df1 100644
--- a/src/plugins/debugger/disassembleragent.cpp
+++ b/src/plugins/debugger/disassembleragent.cpp
@@ -337,7 +337,7 @@ void DisassemblerAgent::updateLocationMarker()
 
     // Center cursor.
     if (EditorManager::currentDocument() == d->document)
-        if (auto textEditor = qobject_cast<BaseTextEditor *>(EditorManager::currentEditor()))
+        if (auto textEditor = BaseTextEditor::currentTextEditor())
             textEditor->gotoLine(lineNumber);
 }