diff --git a/src/Mod/BIM/ArchPanel.py b/src/Mod/BIM/ArchPanel.py
index 77abc9512c..ac673e83ff 100644
--- a/src/Mod/BIM/ArchPanel.py
+++ b/src/Mod/BIM/ArchPanel.py
@@ -403,6 +403,9 @@ class _Panel(ArchComponent.Component):
 
                 baseface = Part.Face(basewire)
                 base = baseface.extrude(Vector(0,bb.YLength,0))
+                if normal.cross(FreeCAD.Vector(0,0,1)).Length > 1e-6:
+                    rot = FreeCAD.Rotation(FreeCAD.Vector(0,-1,0),FreeCAD.Vector(*normal[:2],0))
+                    base.rotate(bb.Center,rot.Axis,math.degrees(rot.Angle))
                 rot = FreeCAD.Rotation(FreeCAD.Vector(0,0,1),normal)
                 base.rotate(bb.Center,rot.Axis,math.degrees(rot.Angle))
                 if obj.WaveDirection.Value: