diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index 4522a786a32..53032827bea 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#include "diffeditorcontroller.h"
-
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/idocument.h>
 #include <utils/guard.h>
diff --git a/src/plugins/diffeditor/diffeditorcontroller.h b/src/plugins/diffeditor/diffeditorcontroller.h
index ebe1151ce1e..643a855f80a 100644
--- a/src/plugins/diffeditor/diffeditorcontroller.h
+++ b/src/plugins/diffeditor/diffeditorcontroller.h
@@ -66,6 +66,7 @@ public:
     static DiffEditorController *controller(Core::IDocument *document);
 
     void branchesReceived(const QString &branches);
+    void requestChunkActions(QMenu *menu, int diffFileIndex, int chunkIndex);
 
 signals:
     void chunkActionsRequested(QMenu *menu, bool isValid);
@@ -87,7 +88,6 @@ protected:
 
 private:
     void requestMoreInformation();
-    void requestChunkActions(QMenu *menu, int diffFileIndex, int chunkIndex);
 
     Internal::DiffEditorDocument *const m_document;
 
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp
index c1896f969b3..0845f3ef03c 100644
--- a/src/plugins/diffeditor/diffeditordocument.cpp
+++ b/src/plugins/diffeditor/diffeditordocument.cpp
@@ -71,8 +71,6 @@ void DiffEditorDocument::setController(DiffEditorController *controller)
     m_controller = controller;
 
     if (m_controller) {
-        connect(this, &DiffEditorDocument::chunkActionsRequested,
-                m_controller, &DiffEditorController::requestChunkActions);
         connect(this, &DiffEditorDocument::requestMoreInformation,
                 m_controller, &DiffEditorController::requestMoreInformation);
     }
diff --git a/src/plugins/diffeditor/diffeditordocument.h b/src/plugins/diffeditor/diffeditordocument.h
index db0d3f04a3d..2a5293dfaf1 100644
--- a/src/plugins/diffeditor/diffeditordocument.h
+++ b/src/plugins/diffeditor/diffeditordocument.h
@@ -90,7 +90,6 @@ signals:
     void temporaryStateChanged();
     void documentChanged();
     void descriptionChanged();
-    void chunkActionsRequested(QMenu *menu, int diffFileIndex, int chunkIndex);
     void requestMoreInformation();
 
 private:
diff --git a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
index 66977ec065a..1e7b4bc35c4 100644
--- a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
+++ b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
@@ -25,6 +25,7 @@
 
 #include "diffeditorwidgetcontroller.h"
 #include "diffeditorconstants.h"
+#include "diffeditorcontroller.h"
 #include "diffeditordocument.h"
 
 #include <coreplugin/documentmanager.h>
@@ -247,7 +248,8 @@ bool DiffEditorWidgetController::setAndVerifyIndexes(QMenu *menu,
     if (m_contextMenuChunkIndex >= fileData.chunks.count())
         return false;
 
-    m_document->chunkActionsRequested(menu, diffFileIndex, chunkIndex);
+    if (DiffEditorController *controller = m_document->controller())
+        controller->requestChunkActions(menu, diffFileIndex, chunkIndex);
 
     return true;
 }