diff --git a/discover_overlay/glade/settings.glade b/discover_overlay/glade/settings.glade
index 2f7bcbf..cbbf06b 100644
--- a/discover_overlay/glade/settings.glade
+++ b/discover_overlay/glade/settings.glade
@@ -2092,7 +2092,7 @@
           </packing>
         </child>
         <child>
-          <!-- n-columns=2 n-rows=3 -->
+          <!-- n-columns=2 n-rows=4 -->
           <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
@@ -2107,7 +2107,7 @@
                 <property name="name">core_run_on_startup_label</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="label" translatable="yes">Run on Startup</property>
+                <property name="label" translatable="yes">Run overlay on startup</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -2129,33 +2129,6 @@
                 <property name="top-attach">0</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="name">core_force_xshape_label</property>
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="label" translatable="yes">Force XShape</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton">
-                <property name="name">core_force_xshape</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">False</property>
-                <property name="draw-indicator">True</property>
-                <signal name="toggled" handler="core_force_xshape_changed" swapped="no"/>
-              </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkLabel">
                 <property name="name">core_show_tray_icon_label</property>
@@ -2166,7 +2139,7 @@
               </object>
               <packing>
                 <property name="left-attach">0</property>
-                <property name="top-attach">2</property>
+                <property name="top-attach">3</property>
               </packing>
             </child>
             <child>
@@ -2180,9 +2153,61 @@
               </object>
               <packing>
                 <property name="left-attach">1</property>
+                <property name="top-attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="name">core_force_xshape_label</property>
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes">Force XShape</property>
+                <property name="xalign">0</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
                 <property name="top-attach">2</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkCheckButton">
+                <property name="name">core_force_xshape</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="draw-indicator">True</property>
+                <signal name="toggled" handler="core_force_xshape_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes">Run configuration on startup</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton">
+                <property name="name">core_run_conf_on_startup</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="draw-indicator">True</property>
+                <signal name="toggled" handler="core_run_conf_on_startup_changed" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="position">4</property>
diff --git a/discover_overlay/settings_window.py b/discover_overlay/settings_window.py
index 4c26bda..f71868f 100644
--- a/discover_overlay/settings_window.py
+++ b/discover_overlay/settings_window.py
@@ -42,6 +42,7 @@ class MainSettingsWindow():
         self.text_placement_window = None
         self.voice_advanced = False
         self.autostart_helper = Autostart("discover_overlay")
+        self.autostart_helper_conf = Autostart("discover_overlay_configure")
         self.ind = None
         self.guild_ids = []
         self.channel_ids = []
@@ -412,6 +413,8 @@ class MainSettingsWindow():
 
         self.widget['core_run_on_startup'].set_active(self.autostart_helper.is_auto())
 
+        self.widget['core_run_conf_on_startup'].set_active(self.autostart_helper_conf.is_auto())
+
         self.widget['core_force_xshape'].set_active(config.getboolean("general", "xshape", fallback=False))
 
         self.show_sys_tray_icon = config.getboolean(
@@ -865,6 +868,9 @@ class MainSettingsWindow():
     def core_run_on_startup_changed(self, button):
         self.autostart_helper.set_autostart(button.get_active())
 
+    def core_run_conf_on_startup_changed(self, button):
+        self.autostart_helper_conf.set_autostart(button.get_active())
+
     def core_force_xshape_changed(self, button):
         self.config_set("general", "xshape", "%s" % (button.get_active()))
 
diff --git a/discover_overlay_configure.desktop b/discover_overlay_configure.desktop
new file mode 100644
index 0000000..7ce0fb6
--- /dev/null
+++ b/discover_overlay_configure.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Discover Overlay Configure
+Comment=Voice chat overlay configuration
+Exec=discover-overlay --configure
+Icon=discover-overlay
+Terminal=false
+Type=Application
+Actions=close;configure
+Categories=Utility;TelephonyTools
+Keywords=Discord
\ No newline at end of file
diff --git a/setup.py b/setup.py
index b51cd8c..9d6cef8 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setup(
     name='discover-overlay',
     author='trigg',
     author_email='',
-    version='0.5.5',
+    version='0.6.0',
     description='Voice chat overlay',
     long_description=readme(),
     long_description_content_type='text/markdown',
@@ -18,7 +18,7 @@ setup(
     include_package_data=True,
     data_files=[
         ('share/applications', [
-            'discover_overlay.desktop'
+            'discover_overlay.desktop','discover_overlay_configure.desktop'
         ]),
         ('share/icons/hicolor/256x256/apps',
          ['discover-overlay.png', 'discover-overlay-tray.png', 'discover-overlay-default.png']),