diff --git a/ModuleKit/settings.swift b/ModuleKit/settings.swift
index 70e12146..0ea1eec7 100644
--- a/ModuleKit/settings.swift
+++ b/ModuleKit/settings.swift
@@ -152,13 +152,14 @@ open class Settings: NSView, Settings_p {
 
             toggle = switchButton
         } else {
-            let button: NSButton = NSButton(frame: NSRect(x: self.frame.width-55, y: 0, width: 30, height: view.frame.height))
+            let button: NSButton = NSButton(frame: NSRect(x: self.frame.width-30, y: 0, width: 15, height: view.frame.height))
             button.setButtonType(.switch)
             button.state = state ? .on : .off
             button.title = ""
             button.action = #selector(self.toggleEnable)
             button.isBordered = false
             button.isTransparent = true
+            button.target = self
             
             toggle = button
         }
diff --git a/Stats.xcodeproj/project.pbxproj b/Stats.xcodeproj/project.pbxproj
index 6e5da970..b93200b9 100644
--- a/Stats.xcodeproj/project.pbxproj
+++ b/Stats.xcodeproj/project.pbxproj
@@ -1515,7 +1515,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 2.0.4;
+				MARKETING_VERSION = 2.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1547,7 +1547,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 2.0.4;
+				MARKETING_VERSION = 2.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Stats/Views/AppSettings.swift b/Stats/Views/AppSettings.swift
index 2f8ff9c2..bfbe2fa8 100644
--- a/Stats/Views/AppSettings.swift
+++ b/Stats/Views/AppSettings.swift
@@ -158,6 +158,7 @@ class ApplicationSettings: NSView {
             button.action = action
             button.isBordered = false
             button.isTransparent = true
+            button.target = self
             
             toggle = button
         }
diff --git a/StatsKit/extensions.swift b/StatsKit/extensions.swift
index b4ae721e..3fd33c03 100644
--- a/StatsKit/extensions.swift
+++ b/StatsKit/extensions.swift
@@ -298,10 +298,11 @@ public extension NSView {
             button.action = action
             button.isBordered = false
             button.isTransparent = true
+            button.target = self
             
             toggle = button
         }
-
+        
         row.addSubview(toggle)
         row.addSubview(rowTitle)