diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp b/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
index bd5e13568c..fb094498ce 100644
--- a/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp
@@ -150,7 +150,15 @@ void QGIBalloonLabel::mouseReleaseEvent(QGraphicsSceneMouseEvent * event)
 
 void QGIBalloonLabel::mouseDoubleClickEvent(QGraphicsSceneMouseEvent * event)
 {
-//    Gui::Control().showDialog(new TaskDlgBalloon(parent));   //only from tree
+    QGIViewBalloon* qgivBalloon = dynamic_cast<QGIViewBalloon*>(parentItem());
+    if (qgivBalloon == nullptr) {
+        return;
+    }
+    auto ViewProvider = static_cast<ViewProviderBalloon*>(qgivBalloon->getViewProvider(qgivBalloon->getViewObject()));
+    if (ViewProvider == nullptr) {
+        return;
+    }
+    Gui::Control().showDialog(new TaskDlgBalloon(qgivBalloon, ViewProvider));
     QGraphicsItem::mouseDoubleClickEvent(event);
 }
 
diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.cpp b/src/Mod/TechDraw/Gui/TaskBalloon.cpp
index f5938235ee..1077466951 100644
--- a/src/Mod/TechDraw/Gui/TaskBalloon.cpp
+++ b/src/Mod/TechDraw/Gui/TaskBalloon.cpp
@@ -28,7 +28,6 @@
 #endif // #ifndef _PreComp_
 
 #include <Base/Console.h>
-#include <Base/Vector3D.h>
 
 #include <Gui/Application.h>
 #include <Gui/BitmapFactory.h>
@@ -41,11 +40,8 @@
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 
-#include <Mod/Part/App/PartFeature.h>
-
 #include <Mod/TechDraw/App/DrawViewBalloon.h>
 #include <Mod/TechDraw/App/DrawPage.h>
-#include <Mod/TechDraw/App/DrawUtil.h>
 #include <Mod/TechDraw/App/ArrowPropEnum.h>
 
 #include <Mod/TechDraw/Gui/ui_TaskBalloon.h>
diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.h b/src/Mod/TechDraw/Gui/TaskBalloon.h
index b292557c06..6a3b01567d 100644
--- a/src/Mod/TechDraw/Gui/TaskBalloon.h
+++ b/src/Mod/TechDraw/Gui/TaskBalloon.h
@@ -29,8 +29,6 @@
 
 #include <Mod/TechDraw/Gui/ui_TaskBalloon.h>
 
-#include <Mod/TechDraw/App/DrawViewPart.h>
-
 #include "QGIViewBalloon.h"
 #include "ViewProviderBalloon.h"
 
@@ -58,8 +56,8 @@ private Q_SLOTS:
     void onFontsizeChanged();
     void onBubbleShapeChanged();
     void onShapeScaleChanged();
-    void onEndSymbolChanged();
-    void onEndSymbolScaleChanged();
+    void onEndSymbolChanged();
+    void onEndSymbolScaleChanged();
     void onLineVisibleChanged();
     void onLineWidthChanged();
     void onKinkLengthChanged();