diff --git a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.Events.cs b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.Events.cs
index e3e45d2..3938efd 100644
--- a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.Events.cs
+++ b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.Events.cs
@@ -773,7 +773,6 @@ public partial class MainForm : Form
         log.Info("SettingsProfileDropDown.SelectedIndex has been changed to " + modSettingsProfileDropDown.SelectedIndex + ".");
         if (modSettingsProfileDropDown.SelectedIndex <= 0 || modSettingsProfileDropDown.Items.Count == 0)
         {
-            desktopShortcutButton.Enabled = false;
             deleteModButton.Enabled = false;
             deleteModButton.ToolTip = null;
             updateModButton.Enabled = false;
@@ -790,6 +789,7 @@ public partial class MainForm : Form
             updateModButton.ToolTip = HelperMethods.GetText(Text.UpdateModButtonToolTip, profileName);
         }
 
+        desktopShortcutButton.Enabled = Directory.Exists(Core.ProfilesPath + "/" + profileName);
         profileButton.Enabled = Directory.Exists(Core.ProfilesPath + "/" + profileName);
         profileButton.ToolTip = HelperMethods.GetText(Text.OpenProfileFolderToolTip, profileName);
         saveButton.Enabled = true;
diff --git a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.StateMachine.cs b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.StateMachine.cs
index 87fdd7f..577cbb6 100644
--- a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.StateMachine.cs
+++ b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.StateMachine.cs
@@ -187,6 +187,7 @@ public partial class MainForm
 
         settingsProfileLabel.TextColor = colorGreen;
         modSettingsProfileDropDown.Enabled = enabled;
+        desktopShortcutButton.Enabled = enabled;
         profileButton.Enabled = enabled;
         profileButton.ToolTip = HelperMethods.GetText(Text.OpenProfileFolderToolTip, selectedProfileName);
         saveButton.Enabled = enabled;
@@ -197,12 +198,13 @@ public partial class MainForm
         // Only enable these, when we're not on the community updates
         if (modSettingsProfileDropDown.SelectedIndex > 0)
         {
-            desktopShortcutButton.Enabled = enabled;
             updateModButton.Enabled = profileList[modSettingsProfileDropDown.SelectedIndex].Installable;
             updateModButton.ToolTip = HelperMethods.GetText(Text.UpdateModButtonToolTip, selectedProfileName);
             deleteModButton.Enabled = enabled;
             deleteModButton.ToolTip = HelperMethods.GetText(Text.DeleteModButtonToolTip, selectedProfileName);
         }
+        
+        
 
         Color col = enabled ? colorGreen : colorInactive;