diff --git a/src/Artemis.UI/Screens/Settings/Debug/Tabs/RenderDebugViewModel.cs b/src/Artemis.UI/Screens/Settings/Debug/Tabs/RenderDebugViewModel.cs
index 7bfd7ef8d..e07bf9d37 100644
--- a/src/Artemis.UI/Screens/Settings/Debug/Tabs/RenderDebugViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/Debug/Tabs/RenderDebugViewModel.cs
@@ -66,6 +66,7 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
         {
             Execute.PostToUIThread(() =>
             {
+                // TODO: Remove, frames shouldn't even be rendered if this is the case
                 if (e.Texture.Bitmap.Pixels.Length == 0)
                     return;
 
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
index 831640a64..641a288d5 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
+++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
@@ -136,16 +136,15 @@ namespace Artemis.UI.Screens.SurfaceEditor
             if (!ColorDevices)
                 return;
 
+            e.Canvas.Clear(new SKColor(0, 0, 0));
             foreach (ListDeviceViewModel listDeviceViewModel in ListDeviceViewModels)
             {
                 // Order by position to accurately get the first LED
-                List<ArtemisLed> leds = listDeviceViewModel.Device.Leds.OrderBy(l => l.Rectangle.Left).ThenBy(l => l.Rectangle.Top).ToList();
+                List<ArtemisLed> leds = listDeviceViewModel.Device.Leds.OrderBy(l => l.RgbLed.Location.Y).ThenBy(l => l.RgbLed.Location.X).ToList();
                 for (int index = 0; index < leds.Count; index++)
                 {
                     ArtemisLed artemisLed = leds[index];
-                    if (ColorFirstLedOnly && index > 0)
-                        e.Canvas.DrawRect(artemisLed.AbsoluteRectangle, new SKPaint {Color = new SKColor(0, 0, 0)});
-                    else
+                    if (ColorFirstLedOnly && index == 0 || !ColorFirstLedOnly)
                         e.Canvas.DrawRect(artemisLed.AbsoluteRectangle, new SKPaint {Color = listDeviceViewModel.Color});
                 }
             }