diff --git a/src/Mod/Part/App/PartFeatures.cpp b/src/Mod/Part/App/PartFeatures.cpp
index b3ca6c658f..314b1b1280 100644
--- a/src/Mod/Part/App/PartFeatures.cpp
+++ b/src/Mod/Part/App/PartFeatures.cpp
@@ -310,13 +310,32 @@ App::DocumentObjectExecReturn *Loft::execute(void)
 
             // Extract first element of a compound
             if (shape.ShapeType() == TopAbs_COMPOUND) {
+                Handle(TopTools_HSequenceOfShape) hEdges = new TopTools_HSequenceOfShape();
+                Handle(TopTools_HSequenceOfShape) hWires = new TopTools_HSequenceOfShape();
+
                 TopoDS_Iterator it(shape);
-                for (; it.More(); it.Next()) {
+                int numChilds=0;
+                TopoDS_Shape child;
+                for (; it.More(); it.Next(), numChilds++) {
                     if (!it.Value().IsNull()) {
-                        shape = it.Value();
-                        break;
+                        child = it.Value();
+                        if (child.ShapeType() == TopAbs_EDGE) {
+                            hEdges->Append(child);
+                        }
                     }
                 }
+
+                // a single child
+                if (numChilds == 1) {
+                    shape = child;
+                }
+                // or all children are edges
+                else if (hEdges->Length() == numChilds) {
+                    ShapeAnalysis_FreeBounds::ConnectEdgesToWires(hEdges,
+                        Precision::Confusion(), Standard_False, hWires);
+                    if (hWires->Length() == 1)
+                        shape = hWires->Value(1);
+                }
             }
             if (shape.ShapeType() == TopAbs_FACE) {
                 TopoDS_Wire faceouterWire = ShapeAnalysis::OuterWire(TopoDS::Face(shape));
diff --git a/src/Mod/Part/Gui/TaskLoft.cpp b/src/Mod/Part/Gui/TaskLoft.cpp
index 526d591699..9ad40026d6 100644
--- a/src/Mod/Part/Gui/TaskLoft.cpp
+++ b/src/Mod/Part/Gui/TaskLoft.cpp
@@ -26,7 +26,12 @@
 #ifndef _PreComp_
 # include <QMessageBox>
 # include <QTextStream>
+# include <Precision.hxx>
+# include <ShapeAnalysis_FreeBounds.hxx>
 # include <TopoDS_Iterator.hxx>
+# include <TopoDS.hxx>
+# include <TopoDS_Edge.hxx>
+# include <TopTools_HSequenceOfShape.hxx>
 #endif
 
 #include "ui_TaskLoft.h"
@@ -101,18 +106,35 @@ void LoftWidget::findShapes()
         TopoDS_Shape shape = (*it)->Shape.getValue();
         if (shape.IsNull()) continue;
 
-        // also allow compounds with a single face, wire, edge or vertex
+        // also allow compounds with a single face, wire or vertex or
+        // if there are only edges building one wire
         if (shape.ShapeType() == TopAbs_COMPOUND) {
+            Handle(TopTools_HSequenceOfShape) hEdges = new TopTools_HSequenceOfShape();
+            Handle(TopTools_HSequenceOfShape) hWires = new TopTools_HSequenceOfShape();
+
             TopoDS_Iterator it(shape);
             int numChilds=0;
             TopoDS_Shape child;
             for (; it.More(); it.Next(), numChilds++) {
-                if (!it.Value().IsNull())
+                if (!it.Value().IsNull()) {
                     child = it.Value();
+                    if (child.ShapeType() == TopAbs_EDGE) {
+                        hEdges->Append(child);
+                    }
+                }
             }
 
-            if (numChilds == 1)
+            // a single child
+            if (numChilds == 1) {
                 shape = child;
+            }
+            // or all children are edges
+            else if (hEdges->Length() == numChilds) {
+                ShapeAnalysis_FreeBounds::ConnectEdgesToWires(hEdges,
+                    Precision::Confusion(), Standard_False, hWires);
+                if (hWires->Length() == 1)
+                    shape = hWires->Value(1);
+            }
         }
 
         if (shape.ShapeType() == TopAbs_FACE ||