diff --git a/Artemis/Artemis/Models/EffectModel.cs b/Artemis/Artemis/Models/EffectModel.cs
index c230c97b0..6ba25f88a 100644
--- a/Artemis/Artemis/Models/EffectModel.cs
+++ b/Artemis/Artemis/Models/EffectModel.cs
@@ -31,6 +31,7 @@ namespace Artemis.Models
         // Called every frame
         public abstract void Update();
 
+        // Used by profile system
         public IDataModel DataModel { get; set; }
         public ProfileModel Profile { get; set; }
 
diff --git a/Artemis/Artemis/Modules/Effects/WindowsProfile/WindowsProfileView.xaml b/Artemis/Artemis/Modules/Effects/WindowsProfile/WindowsProfileView.xaml
index f5782be8a..df8ec88a2 100644
--- a/Artemis/Artemis/Modules/Effects/WindowsProfile/WindowsProfileView.xaml
+++ b/Artemis/Artemis/Modules/Effects/WindowsProfile/WindowsProfileView.xaml
@@ -34,9 +34,9 @@
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
                     <Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
                     <ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
-                                  IsChecked="{Binding Path=GameSettings.Enabled, Mode=TwoWay}"
                                   Style="{DynamicResource MetroCircleToggleButtonStyle}"
-                                  cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
+                                  cal:Message.Attach="[Event Click] = [Action ToggleEffect]"
+                                  ToolTip="Note: You can't enable an effect when Artemis is disabled" />
                 </StackPanel>
             </StackPanel>
 
diff --git a/Artemis/Artemis/Modules/Effects/WindowsProfile/WindowsProfileViewModel.cs b/Artemis/Artemis/Modules/Effects/WindowsProfile/WindowsProfileViewModel.cs
index 45db154fe..fc92c15f6 100644
--- a/Artemis/Artemis/Modules/Effects/WindowsProfile/WindowsProfileViewModel.cs
+++ b/Artemis/Artemis/Modules/Effects/WindowsProfile/WindowsProfileViewModel.cs
@@ -19,12 +19,13 @@ namespace Artemis.Modules.Effects.WindowsProfile
             DisplayName = "Windows Profile";
             PFactory = pFactory;
             ProfilePreviewModel = profilePreviewModel;
-            EffectSettings = ((WindowsProfileModel) EffectModel).Settings;
+            EffectSettings = ((WindowsProfileModel)EffectModel).Settings;
 
-            ProfileEditor = PFactory.CreateProfileEditorVm(events, main, (WindowsProfileModel) EffectModel,
-                ((WindowsProfileSettings) EffectSettings).LastProfile);
+            ProfileEditor = PFactory.CreateProfileEditorVm(events, main, (WindowsProfileModel)EffectModel,
+                ((WindowsProfileSettings)EffectSettings).LastProfile);
             ProfilePreviewModel.Profile = ProfileEditor.SelectedProfile;
             ProfileEditor.PropertyChanged += ProfileUpdater;
+            MainManager.EffectManager.EffectModels.Add(EffectModel);
         }
 
         public ProfileEditorViewModel ProfileEditor { get; set; }
@@ -42,7 +43,7 @@ namespace Artemis.Modules.Effects.WindowsProfile
             if (e.PropertyName != "SelectedProfile" || !ProfileEditor.ProfileViewModel.Activated ||
                 ProfileEditor.ProfileViewModel.SelectedProfile == null)
                 return;
-            ((WindowsProfileSettings) EffectSettings).LastProfile = ProfileEditor.ProfileViewModel.SelectedProfile.Name;
+            ((WindowsProfileSettings)EffectSettings).LastProfile = ProfileEditor.ProfileViewModel.SelectedProfile.Name;
             EffectSettings.Save();
         }