diff --git a/DisplayMagician/UIForms/MainForm.Designer.cs b/DisplayMagician/UIForms/MainForm.Designer.cs
index 0a7eea4..400b297 100644
--- a/DisplayMagician/UIForms/MainForm.Designer.cs
+++ b/DisplayMagician/UIForms/MainForm.Designer.cs
@@ -230,6 +230,7 @@
             this.Name = "MainForm";
             this.ShowIcon = false;
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.Activated += new System.EventHandler(this.MainForm_Activated);
             this.Load += new System.EventHandler(this.MainForm_Load);
             this.splitContainer1.Panel1.ResumeLayout(false);
             this.splitContainer1.Panel2.ResumeLayout(false);
diff --git a/DisplayMagician/UIForms/MainForm.cs b/DisplayMagician/UIForms/MainForm.cs
index 6d9b92f..d25484c 100644
--- a/DisplayMagician/UIForms/MainForm.cs
+++ b/DisplayMagician/UIForms/MainForm.cs
@@ -12,6 +12,7 @@ using System.Threading;
 using System.Reflection;
 using DisplayMagician.Shared;
 using System.Runtime.InteropServices;
+using System.IO;
 
 namespace DisplayMagician.UIForms
 {
@@ -119,8 +120,26 @@ namespace DisplayMagician.UIForms
         {
             // Start loading the Steam Games just after the Main form opens
             //SteamGame.GetAllInstalledGames();
+            EnableShortcutButtonIfProfiles();
         }
 
+        private void EnableShortcutButtonIfProfiles()
+        {
+            if (ProfileRepository.AllProfiles.Count > 0)
+            {
+                btn_setup_game_shortcuts.Visible = true;
+                pb_game_shortcut.Enabled = true;
+            }
+            else
+            {
+                btn_setup_game_shortcuts.Visible = false;
+                pb_game_shortcut.Enabled = false;
+
+            }
+
+        }
+
+
         private void RefreshNotifyIconMenus()
         {
             // Clear all the profiles
@@ -250,5 +269,9 @@ namespace DisplayMagician.UIForms
             }
         }
 
+        private void MainForm_Activated(object sender, EventArgs e)
+        {
+            EnableShortcutButtonIfProfiles();
+        }
     }
 }
diff --git a/DisplayMagician/UIForms/MainForm.resx b/DisplayMagician/UIForms/MainForm.resx
index ce43f63..6846706 100644
--- a/DisplayMagician/UIForms/MainForm.resx
+++ b/DisplayMagician/UIForms/MainForm.resx
@@ -142,7 +142,7 @@
     <value>Microsoft Sans Serif, 21.75pt</value>
   </data>
   <data name="btn_setup_display_profiles.Location" type="System.Drawing.Point, System.Drawing">
-    <value>210, 168</value>
+    <value>210, 166</value>
   </data>
   <data name="btn_setup_display_profiles.Size" type="System.Drawing.Size, System.Drawing">
     <value>360, 50</value>
@@ -10738,7 +10738,7 @@
     <value>NoControl</value>
   </data>
   <data name="cb_minimise_notification_area.Location" type="System.Drawing.Point, System.Drawing">
-    <value>232, 354</value>
+    <value>232, 357</value>
   </data>
   <data name="cb_minimise_notification_area.Size" type="System.Drawing.Size, System.Drawing">
     <value>332, 20</value>
@@ -10771,7 +10771,7 @@
     <value>Microsoft Sans Serif, 9.75pt</value>
   </data>
   <data name="lbl_version.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 355</value>
+    <value>12, 358</value>
   </data>
   <data name="lbl_version.Size" type="System.Drawing.Size, System.Drawing">
     <value>25, 16</value>
@@ -10807,7 +10807,7 @@
     <value>Microsoft Sans Serif, 21.75pt</value>
   </data>
   <data name="btn_setup_game_shortcuts.Location" type="System.Drawing.Point, System.Drawing">
-    <value>212, 186</value>
+    <value>212, 180</value>
   </data>
   <data name="btn_setup_game_shortcuts.Size" type="System.Drawing.Size, System.Drawing">
     <value>360, 50</value>
@@ -10840,7 +10840,7 @@
     <value>NoControl</value>
   </data>
   <data name="btn_exit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>700, 351</value>
+    <value>700, 354</value>
   </data>
   <data name="btn_exit.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
diff --git a/DisplayMagician/UIForms/ShortcutForm.Designer.cs b/DisplayMagician/UIForms/ShortcutForm.Designer.cs
index 20a8430..a9add75 100644
--- a/DisplayMagician/UIForms/ShortcutForm.Designer.cs
+++ b/DisplayMagician/UIForms/ShortcutForm.Designer.cs
@@ -1036,11 +1036,14 @@ namespace DisplayMagician.UIForms
             // 
             // btn_choose_game
             // 
+            this.btn_choose_game.FlatAppearance.MouseDownBackColor = System.Drawing.Color.IndianRed;
+            this.btn_choose_game.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Brown;
             this.btn_choose_game.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btn_choose_game.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btn_choose_game.ForeColor = System.Drawing.Color.White;
-            this.btn_choose_game.Location = new System.Drawing.Point(411, 115);
+            this.btn_choose_game.Location = new System.Drawing.Point(408, 117);
             this.btn_choose_game.Name = "btn_choose_game";
-            this.btn_choose_game.Size = new System.Drawing.Size(29, 31);
+            this.btn_choose_game.Size = new System.Drawing.Size(40, 46);
             this.btn_choose_game.TabIndex = 16;
             this.btn_choose_game.Text = ">>";
             this.btn_choose_game.UseVisualStyleBackColor = true;