diff --git a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs
index 704ad7ab6..28696008f 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/Panels/VisualEditor/VisualEditorView.axaml.cs
@@ -81,7 +81,7 @@ public class VisualEditorView : ReactiveUserControl<VisualEditorViewModel>
 
     private void AutoFit(bool skipTransitions)
     {
-        if (ViewModel == null)
+        if (ViewModel == null || !ViewModel.Devices.Any())
             return;
 
         double left = ViewModel.Devices.Select(d => d.Rectangle.Left).Min();