diff --git a/DisplayMagician/Properties/AssemblyInfo.cs b/DisplayMagician/Properties/AssemblyInfo.cs
index b750474..36c1863 100644
--- a/DisplayMagician/Properties/AssemblyInfo.cs
+++ b/DisplayMagician/Properties/AssemblyInfo.cs
@@ -26,8 +26,8 @@ using System.Resources;
 [assembly: Guid("e4ceaf5e-ad01-4695-b179-31168eb74c48")]
 
 // Version information
-[assembly: AssemblyVersion("2.1.0.142")]
-[assembly: AssemblyFileVersion("2.1.0.142")]
+[assembly: AssemblyVersion("2.1.0.145")]
+[assembly: AssemblyFileVersion("2.1.0.145")]
 [assembly: NeutralResourcesLanguageAttribute( "en" )]
 [assembly: CLSCompliant(true)]
 
diff --git a/DisplayMagician/ShortcutItem.cs b/DisplayMagician/ShortcutItem.cs
index 58b6b21..94d5faa 100644
--- a/DisplayMagician/ShortcutItem.cs
+++ b/DisplayMagician/ShortcutItem.cs
@@ -69,7 +69,6 @@ namespace DisplayMagician
         public string Executable;
         public string Arguments;
         public bool ExecutableArgumentsRequired;
-        public bool CloseOnFinish;
         public bool DontStartIfAlreadyRunning;
     }
 
diff --git a/DisplayMagician/UIForms/ChooseIconForm.Designer.cs b/DisplayMagician/UIForms/ChooseIconForm.Designer.cs
index 3bd1b7e..c10bbc1 100644
--- a/DisplayMagician/UIForms/ChooseIconForm.Designer.cs
+++ b/DisplayMagician/UIForms/ChooseIconForm.Designer.cs
@@ -111,6 +111,7 @@ namespace DisplayMagician.UIForms
             this.btn_add.TabIndex = 39;
             this.btn_add.Text = "Add icons";
             this.btn_add.UseVisualStyleBackColor = true;
+            this.btn_add.Click += new System.EventHandler(this.btn_add_Click);
             // 
             // btn_select
             // 
diff --git a/DisplayMagician/UIForms/ChooseIconForm.cs b/DisplayMagician/UIForms/ChooseIconForm.cs
index aa31537..f2e1754 100644
--- a/DisplayMagician/UIForms/ChooseIconForm.cs
+++ b/DisplayMagician/UIForms/ChooseIconForm.cs
@@ -97,5 +97,10 @@ namespace DisplayMagician.UIForms
                 }
             }
         }
+
+        private void btn_add_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }
diff --git a/DisplayMagician/UIForms/ShortcutForm.Designer.cs b/DisplayMagician/UIForms/ShortcutForm.Designer.cs
index 0296cfb..e5788ef 100644
--- a/DisplayMagician/UIForms/ShortcutForm.Designer.cs
+++ b/DisplayMagician/UIForms/ShortcutForm.Designer.cs
@@ -1260,6 +1260,7 @@ namespace DisplayMagician.UIForms
             // 
             // btn_run_cmd_afterwards
             // 
+            this.btn_run_cmd_afterwards.Enabled = false;
             this.btn_run_cmd_afterwards.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btn_run_cmd_afterwards.ForeColor = System.Drawing.Color.White;
             this.btn_run_cmd_afterwards.Location = new System.Drawing.Point(645, 35);
@@ -1268,6 +1269,7 @@ namespace DisplayMagician.UIForms
             this.btn_run_cmd_afterwards.TabIndex = 11;
             this.btn_run_cmd_afterwards.Text = "Choose";
             this.btn_run_cmd_afterwards.UseVisualStyleBackColor = true;
+            this.btn_run_cmd_afterwards.Click += new System.EventHandler(this.btn_run_cmd_afterwards_Click);
             // 
             // txt_run_cmd_afterwards
             // 
diff --git a/DisplayMagician/UIForms/ShortcutForm.cs b/DisplayMagician/UIForms/ShortcutForm.cs
index d235374..9a993ad 100644
--- a/DisplayMagician/UIForms/ShortcutForm.cs
+++ b/DisplayMagician/UIForms/ShortcutForm.cs
@@ -500,10 +500,18 @@ namespace DisplayMagician.UIForms
                 StopProgram stopProgram = new StopProgram();
                 stopProgram.Executable = txt_run_cmd_afterwards.Text;
                 stopProgram.Priority = 0;
-                stopProgram.DontStartIfAlreadyRunning = false;
-                stopProgram.Arguments = "";
+                stopProgram.DontStartIfAlreadyRunning = false;                
                 stopProgram.Disabled = false;
-                stopProgram.ExecutableArgumentsRequired = false;
+                if (cb_run_cmd_afterwards_args.Checked)
+                {
+                    stopProgram.ExecutableArgumentsRequired = true;
+                    stopProgram.Arguments = txt_run_cmd_afterwards_args.Text;
+                }
+                else
+                {                    
+                    stopProgram.ExecutableArgumentsRequired = false;
+                    stopProgram.Arguments = "";
+                }
                 stopProgram.ProcessPriority = ProcessPriority.Normal;
                 _stopPrograms.Add(stopProgram);
             }
@@ -585,7 +593,7 @@ namespace DisplayMagician.UIForms
                         _hotkey
                     );
                 }
-                catch(Exception ex)
+                catch(Exception ex) 
                 {
                     logger.Error(ex,$"ShortcutForm/btn_save_Click: Exception while trying to update a game shortcut! :  ",
                         txt_shortcut_save_name.Text, 
@@ -2780,6 +2788,11 @@ namespace DisplayMagician.UIForms
                 txt_run_cmd_afterwards_args.Enabled = false;
             }
         }
+
+        private void btn_run_cmd_afterwards_Click(object sender, EventArgs e)
+        {
+            txt_run_cmd_afterwards.Text = getExeFile();
+        }
     }
 
     // Class used to populate combo boxes