diff --git a/src/Artemis.Core/Services/Storage/ProfileService.cs b/src/Artemis.Core/Services/Storage/ProfileService.cs
index 82e91c674..5cdf00f06 100644
--- a/src/Artemis.Core/Services/Storage/ProfileService.cs
+++ b/src/Artemis.Core/Services/Storage/ProfileService.cs
@@ -246,6 +246,16 @@ namespace Artemis.Core.Services
         {
             lock (_profileCategories)
             {
+                ProfileConfiguration? editedProfileConfiguration = _profileCategories.SelectMany(c => c.ProfileConfigurations).FirstOrDefault(p => p.IsBeingEdited);
+                if (editedProfileConfiguration != null)
+                {
+                    editedProfileConfiguration.Profile?.Render(canvas, SKPointI.Empty);
+                    return;
+                }
+
+                if (RenderForEditor)
+                    return;
+
                 // Iterate the children in reverse because the first category must be rendered last to end up on top
                 for (int i = _profileCategories.Count - 1; i > -1; i--)
                 {
@@ -255,15 +265,9 @@ namespace Artemis.Core.Services
                         try
                         {
                             ProfileConfiguration profileConfiguration = profileCategory.ProfileConfigurations[j];
-                            // Always render profiles being edited
-                            if (profileConfiguration.IsBeingEdited)
+                            // Ensure all criteria are met before rendering
+                            if (!profileConfiguration.IsSuspended && !profileConfiguration.IsMissingModule && profileConfiguration.ActivationConditionMet)
                                 profileConfiguration.Profile?.Render(canvas, SKPointI.Empty);
-                            else
-                            {
-                                // Ensure all criteria are met before rendering
-                                if (!profileConfiguration.IsSuspended && !profileConfiguration.IsMissingModule && profileConfiguration.ActivationConditionMet)
-                                    profileConfiguration.Profile?.Render(canvas, SKPointI.Empty);
-                            }
                         }
                         catch (Exception e)
                         {
@@ -395,13 +399,6 @@ namespace Artemis.Core.Services
             }
         }
 
-        /// <summary>
-        ///     Creates a new profile configuration and adds it to the provided <see cref="ProfileCategory" />
-        /// </summary>
-        /// <param name="category">The profile category to add the profile to</param>
-        /// <param name="name">The name of the new profile configuration</param>
-        /// <param name="icon">The icon of the new profile configuration</param>
-        /// <returns>The newly created profile configuration</returns>
         public ProfileConfiguration CreateProfileConfiguration(ProfileCategory category, string name, string icon)
         {
             ProfileConfiguration configuration = new(category, name, icon);
@@ -413,10 +410,6 @@ namespace Artemis.Core.Services
             return configuration;
         }
 
-        /// <summary>
-        ///     Removes the provided profile configuration from the <see cref="ProfileCategory" />
-        /// </summary>
-        /// <param name="profileConfiguration"></param>
         public void RemoveProfileConfiguration(ProfileConfiguration profileConfiguration)
         {
             profileConfiguration.Category.RemoveProfileConfiguration(profileConfiguration);
diff --git a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs
index 54a144305..944111d23 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs
@@ -570,7 +570,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties
         {
             if (!ProfileEditorService.Playing)
             {
-                Pause();
+                CoreService.FrameRendering -= CoreServiceOnFrameRendering;
                 return;
             }
 
diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml
index 4c71321df..d63979f9d 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.xaml
@@ -27,7 +27,7 @@
         <KeyBinding Command="{s:Action Undo}" Modifiers="Control" Key="Z" />
         <KeyBinding Command="{s:Action Redo}" Modifiers="Control" Key="Y" />
         <KeyBinding Command="{s:Action ToggleSuspend}" Key="F5" />
-        <KeyBinding Command="{s:Action ToggleAutoSuspend}" Modifiers="Ctrl" Key="F5" />
+        <KeyBinding Command="{s:Action ToggleAutoSuspend}" Modifiers="Shift" Key="F5" />
     </UserControl.InputBindings>
 
     <Grid ClipToBounds="True">
@@ -105,10 +105,10 @@
                           Command="{s:Action ToggleSuspend}"
                           InputGestureText="F5" />
                 <MenuItem Header="Run Profile on Focus Loss" 
-                          ToolTip="If enabled, regular profile playback is resumed on focus loss"
+                          ToolTip="If enabled, run mode is set to normal on focus loss"
                           IsCheckable="True"
                           IsChecked="{Binding StopOnFocusLoss.Value}"
-                          InputGestureText="Ctrl+F5" />
+                          InputGestureText="Shift+F5" />
             </MenuItem>
             <MenuItem Header="_Scripting" IsEnabled="False">
                 <MenuItem Header="_Profile Scripts"
diff --git a/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileView.xaml b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileView.xaml
index 26e2ae5b8..60061d76e 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileView.xaml
+++ b/src/Artemis.UI/Screens/ProfileEditor/Visualization/ProfileView.xaml
@@ -101,6 +101,7 @@
                         <DataTemplate>
                             <shared:DeviceVisualizer Device="{Binding}"
                                                      ShowColors="True"
+                                                     RenderOptions.BitmapScalingMode="HighQuality"
                                                      HighlightedLeds="{Binding DataContext.HighlightedLeds, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" />
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceView.xaml b/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceView.xaml
index 3f43883b0..f6bc87ac3 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceView.xaml
+++ b/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceView.xaml
@@ -33,7 +33,11 @@
                        Visibility="{Binding Device.Layout.Image, ConverterParameter=Inverted, Converter={StaticResource NullToVisibilityConverter}}"
                        IsHitTestVisible="False"/>
 
-            <shared:DeviceVisualizer Device="{Binding Device}" ShowColors="True" VerticalAlignment="Top" HorizontalAlignment="Left" />
+            <shared:DeviceVisualizer Device="{Binding Device}" 
+                                     RenderOptions.BitmapScalingMode="HighQuality"
+                                     ShowColors="True" 
+                                     VerticalAlignment="Top" 
+                                     HorizontalAlignment="Left" />
 
           </Grid>