diff --git a/src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs b/src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs
index 3f7f8f578..d39100c02 100644
--- a/src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs
+++ b/src/Artemis.UI/ViewModels/Screens/SurfaceEditorViewModel.cs
@@ -199,8 +199,9 @@ namespace Artemis.UI.ViewModels.Screens
             }
 
             var position = e.GetPosition((IInputElement) sender);
+            var relative = e.GetPosition(((Grid)sender).Children[0]);
             if (_mouseDragStatus == MouseDragStatus.Dragging)
-                MoveSelected(position);
+                MoveSelected(relative);
             else if (_mouseDragStatus == MouseDragStatus.Selecting)
                 UpdateSelection(position);
         }
diff --git a/src/Artemis.UI/Views/Screens/SurfaceEditorView.xaml b/src/Artemis.UI/Views/Screens/SurfaceEditorView.xaml
index 903221b27..264efdcee 100644
--- a/src/Artemis.UI/Views/Screens/SurfaceEditorView.xaml
+++ b/src/Artemis.UI/Views/Screens/SurfaceEditorView.xaml
@@ -179,15 +179,6 @@
                         </TextBlock>
                         <TextBox Margin="0 8 0 0" HorizontalAlignment="Stretch" Text="{Binding NewConfigurationName}" />
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                            <Button Style="{StaticResource MaterialDesignFlatButton}" IsDefault="True" Margin="0 8 8 0"
-                                    Command="materialDesign:DialogHost.CloseDialogCommand">
-                                <Button.CommandParameter>
-                                    <system:Boolean xmlns:system="clr-namespace:System;assembly=mscorlib">
-                                        True
-                                    </system:Boolean>
-                                </Button.CommandParameter>
-                                ACCEPT
-                            </Button>
                             <Button Style="{StaticResource MaterialDesignFlatButton}" IsCancel="True" Margin="0 8 8 0"
                                     Command="materialDesign:DialogHost.CloseDialogCommand">
                                 <Button.CommandParameter>
@@ -197,6 +188,15 @@
                                 </Button.CommandParameter>
                                 CANCEL
                             </Button>
+                            <Button Style="{StaticResource MaterialDesignFlatButton}" IsDefault="True" Margin="0 8 8 0"
+                                    Command="materialDesign:DialogHost.CloseDialogCommand">
+                                <Button.CommandParameter>
+                                    <system:Boolean xmlns:system="clr-namespace:System;assembly=mscorlib">
+                                        True
+                                    </system:Boolean>
+                                </Button.CommandParameter>
+                                ACCEPT
+                            </Button>
                         </StackPanel>
                     </StackPanel>
                 </materialDesign:DialogHost.DialogContent>