diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
index 576d3cb2cd..33698cb059 100644
--- a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
+++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
@@ -83,8 +83,10 @@ TaskShapeBinder::TaskShapeBinder(ViewProviderShapeBinder* view, bool /*newObj*/,
 
     PartDesign::ShapeBinder::getFilteredReferences(&static_cast<PartDesign::ShapeBinder*>(vp->getObject())->Support, obj, subs);
 
-    if (obj)
+    if (obj) {
         ui->baseEdit->setText(QString::fromStdString(obj->Label.getStrValue()));
+        ui->baseEdit->setReadOnly(true);
+    }
 
     for (auto sub : subs)
         ui->listWidgetReferences->addItem(QString::fromStdString(sub));
@@ -295,6 +297,22 @@ void TaskShapeBinder::exitSelectionMode() {
     Gui::Selection().clearSelection();
 }
 
+void TaskShapeBinder::accept()
+{
+    if (vp.expired())
+        return;
+
+    std::string label = ui->baseEdit->text().toStdString();
+    PartDesign::ShapeBinder* binder = static_cast<PartDesign::ShapeBinder*>(vp->getObject());
+    if (!binder->Support.getValue() && !label.empty()) {
+        auto mode = selectionMode;
+        selectionMode = refObjAdd;
+        SelectionChanges msg(SelectionChanges::AddSelection, binder->getDocument()->getName(), label.c_str());
+        referenceSelected(msg);
+        selectionMode = mode;
+    }
+}
+
 //**************************************************************************
 //**************************************************************************
 // TaskDialog
@@ -321,6 +339,8 @@ TaskDlgShapeBinder::~TaskDlgShapeBinder()
 bool TaskDlgShapeBinder::accept()
 {
     try {
+        parameter->accept();
+
         Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.recompute()");
         if (!vp->getObject()->isValid())
             throw Base::RuntimeError(vp->getObject()->getStatusString());
diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.h b/src/Mod/PartDesign/Gui/TaskShapeBinder.h
index 0d5ba58119..9683bc17de 100644
--- a/src/Mod/PartDesign/Gui/TaskShapeBinder.h
+++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.h
@@ -53,6 +53,8 @@ public:
     TaskShapeBinder(ViewProviderShapeBinder *view,bool newObj=false,QWidget *parent = nullptr);
     ~TaskShapeBinder();
 
+    void accept();
+
 private Q_SLOTS:
     void onButtonRefAdd(bool checked);
     void onButtonRefRemove(bool checked);