diff --git a/src/Mod/PartDesign/Gui/DlgActiveBody.cpp b/src/Mod/PartDesign/Gui/DlgActiveBody.cpp
index 9aeb1b6c36..fb4841d94f 100644
--- a/src/Mod/PartDesign/Gui/DlgActiveBody.cpp
+++ b/src/Mod/PartDesign/Gui/DlgActiveBody.cpp
@@ -28,6 +28,7 @@
 # include <QMessageBox>
 #endif
 
+#include <App/Application.h>
 #include <Gui/Application.h>
 
 #include "DlgActiveBody.h"
@@ -92,10 +93,15 @@ void DlgActiveBody::accept()
 
     App::DocumentObject* selectedBody =
         selectedItems[0]->data(Qt::UserRole).value<App::DocumentObject*>();
-    if (selectedBody)
+    if (selectedBody) {
         activeBody = makeBodyActive(selectedBody, _doc);
-    else
+    }
+    else {
+        // A transaction must be created as otherwise the undo/redo is broken
+        App::GetApplication().setActiveTransaction(QT_TRANSLATE_NOOP("Command", "Add a Body"), true);
         activeBody = makeBody(_doc);
+        App::GetApplication().closeActiveTransaction();
+    }
 
     QDialog::accept();
 }