diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolView.xaml b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolView.xaml
index e3898bc88..b8cd2ca59 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolView.xaml
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolView.xaml
@@ -11,6 +11,36 @@
              d:DesignWidth="800"
              d:DataContext="{d:DesignInstance {x:Type local:EditToolViewModel}}">
     <Canvas UseLayoutRounding="False">
+
+        <!-- Render these first so that they are always behind the actual shape -->
+        <Ellipse Width="{Binding RotateSize}"
+                 Height="{Binding RotateSize}"
+                 Margin="{Binding RotateOffset}"
+                 Canvas.Left="{Binding TopLeft.X}"
+                 Canvas.Top="{Binding TopLeft.Y}"
+                 Fill="Transparent"
+                 MouseDown="{s:Action ShapeEditMouseDown}" MouseUp="{s:Action ShapeEditMouseUp}" MouseMove="{s:Action TopLeftRotate}" Cursor="Cross" />
+        <Ellipse Width="{Binding RotateSize}"
+                 Height="{Binding RotateSize}"
+                 Margin="{Binding RotateOffset}"
+                 Canvas.Left="{Binding TopRight.X}"
+                 Canvas.Top="{Binding TopRight.Y}"
+                 Fill="Transparent"
+                 MouseDown="{s:Action ShapeEditMouseDown}" MouseUp="{s:Action ShapeEditMouseUp}" MouseMove="{s:Action TopRightRotate}" Cursor="Cross" />
+        <Ellipse Width="{Binding RotateSize}"
+                 Height="{Binding RotateSize}"
+                 Margin="{Binding RotateOffset}"
+                 Canvas.Left="{Binding BottomRight.X}"
+                 Canvas.Top="{Binding BottomRight.Y}"
+                 Fill="Transparent"
+                 MouseDown="{s:Action ShapeEditMouseDown}" MouseUp="{s:Action ShapeEditMouseUp}" MouseMove="{s:Action BottomRightRotate}" Cursor="Cross" />
+        <Ellipse Width="{Binding RotateSize}"
+                 Height="{Binding RotateSize}"
+                 Margin="{Binding RotateOffset}"
+                 Canvas.Left="{Binding BottomLeft.X}"
+                 Canvas.Top="{Binding BottomLeft.Y}"
+                 Fill="Transparent"
+                 MouseDown="{s:Action ShapeEditMouseDown}" MouseUp="{s:Action ShapeEditMouseUp}" MouseMove="{s:Action BottomLeftRotate}" Cursor="Cross" />
         <!-- The part of the layer's shape that is inside the layer -->
         <Path Data="{Binding ShapeGeometry, Mode=OneWay}"
               Fill="Transparent"
@@ -54,14 +84,15 @@
                    Height="{Binding ControlSize}"
                    Margin="{Binding ControlOffset}"
                    Canvas.Left="{Binding LeftCenter.X}"
-                   Canvas.Top="{Binding LeftCenter.Y}" 
+                   Canvas.Top="{Binding LeftCenter.Y}"
                    Fill="White"
                    Stroke="{DynamicResource SecondaryAccentBrush}"
                    StrokeThickness="0.5"
                    MouseDown="{s:Action ShapeEditMouseDown}" MouseUp="{s:Action ShapeEditMouseUp}" MouseMove="{s:Action LeftCenterResize}" />
+
         <Rectangle Width="{Binding ControlSize}"
                    Height="{Binding ControlSize}"
-                   Margin="{Binding ControlOffset}" 
+                   Margin="{Binding ControlOffset}"
                    Canvas.Left="{Binding TopLeft.X}"
                    Canvas.Top="{Binding TopLeft.Y}"
                    Fill="White"
@@ -71,7 +102,7 @@
         <Rectangle Width="{Binding ControlSize}"
                    Height="{Binding ControlSize}"
                    Margin="{Binding ControlOffset}"
-                   Canvas.Left="{Binding TopRight.X}" 
+                   Canvas.Left="{Binding TopRight.X}"
                    Canvas.Top="{Binding TopRight.Y}"
                    Fill="White"
                    Stroke="{DynamicResource SecondaryAccentBrush}"
@@ -80,37 +111,36 @@
         <Rectangle Width="{Binding ControlSize}"
                    Height="{Binding ControlSize}"
                    Margin="{Binding ControlOffset}"
-                   Canvas.Left="{Binding BottomRight.X}" 
-                   Canvas.Top="{Binding BottomRight.Y}" 
+                   Canvas.Left="{Binding BottomRight.X}"
+                   Canvas.Top="{Binding BottomRight.Y}"
                    Fill="White"
                    Stroke="{DynamicResource SecondaryAccentBrush}"
                    StrokeThickness="0.5"
                    MouseDown="{s:Action ShapeEditMouseDown}" MouseUp="{s:Action ShapeEditMouseUp}" MouseMove="{s:Action BottomRightResize}" />
         <Rectangle Width="{Binding ControlSize}"
                    Height="{Binding ControlSize}"
-                   Margin="{Binding ControlOffset}" 
+                   Margin="{Binding ControlOffset}"
                    Canvas.Left="{Binding BottomLeft.X}"
-                   Canvas.Top="{Binding BottomLeft.Y}" 
+                   Canvas.Top="{Binding BottomLeft.Y}"
                    Fill="White"
                    Stroke="{DynamicResource SecondaryAccentBrush}"
                    StrokeThickness="0.5"
                    MouseDown="{s:Action ShapeEditMouseDown}" MouseUp="{s:Action ShapeEditMouseUp}" MouseMove="{s:Action BottomLeftResize}" />
-     
+
         <!-- Anchor point -->
-        
+
         <Ellipse MouseDown="{s:Action AnchorEditMouseDown}"
                  MouseUp="{s:Action ShapeEditMouseUp}"
                  MouseMove="{s:Action AnchorMove}"
                  Width="{Binding ControlSize}"
                  Height="{Binding ControlSize}"
-                 Margin="{Binding ControlOffset}" 
+                 Margin="{Binding ControlOffset}"
                  Fill="White"
                  Stroke="{DynamicResource SecondaryAccentBrush}"
                  StrokeThickness="0.5"
                  Canvas.Left="{Binding ShapeAnchor.X}"
                  Canvas.Top="{Binding ShapeAnchor.Y}"
-                 Cursor="SizeAll">
-        </Ellipse>
+                 Cursor="SizeAll" />
     </Canvas>
 
 </UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs
index 4975064de..a32ffa6d0 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/Visualization/Tools/EditToolViewModel.cs
@@ -39,7 +39,9 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
 
 
         public double ControlSize { get; set; }
+        public double RotateSize { get; set; }
         public Thickness ControlOffset { get; set; }
+        public Thickness RotateOffset { get; set; }
         public double OutlineThickness { get; set; }
 
         public SKRect ShapeRectangle { get; set; }
@@ -91,12 +93,11 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
 
         private void UpdateControls()
         {
-            Execute.PostToUIThread(() =>
-            {
-                ControlSize = Math.Max(10 / ProfileViewModel.PanZoomViewModel.Zoom, 4);
-                ControlOffset = new Thickness(ControlSize / 2 * -1, ControlSize / 2 * -1, 0, 0);
-                OutlineThickness = Math.Max(2 / ProfileViewModel.PanZoomViewModel.Zoom, 1);
-            });
+            ControlSize = Math.Max(10 / ProfileViewModel.PanZoomViewModel.Zoom, 4);
+            RotateSize = ControlSize * 8;
+            ControlOffset = new Thickness(ControlSize / 2 * -1, ControlSize / 2 * -1, 0, 0);
+            RotateOffset = new Thickness(RotateSize / 2 * -1, RotateSize / 2 * -1, 0, 0);
+            OutlineThickness = Math.Max(2 / ProfileViewModel.PanZoomViewModel.Zoom, 1);
         }
 
         public void ShapeEditMouseDown(object sender, MouseButtonEventArgs e)
@@ -351,18 +352,26 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.Visualization.Tools
 
         public void TopLeftRotate(object sender, MouseEventArgs e)
         {
+            if (!_isDragging || !(ProfileEditorService.SelectedProfileElement is Layer layer))
+                return;
         }
 
         public void TopRightRotate(object sender, MouseEventArgs e)
         {
+            if (!_isDragging || !(ProfileEditorService.SelectedProfileElement is Layer layer))
+                return;
         }
 
         public void BottomRightRotate(object sender, MouseEventArgs e)
         {
+            if (!_isDragging || !(ProfileEditorService.SelectedProfileElement is Layer layer))
+                return;
         }
 
         public void BottomLeftRotate(object sender, MouseEventArgs e)
         {
+            if (!_isDragging || !(ProfileEditorService.SelectedProfileElement is Layer layer))
+                return;
         }
 
         #endregion