diff --git a/IceBarElement.lua b/IceBarElement.lua
index 40314fc..51f13c2 100644
--- a/IceBarElement.lua
+++ b/IceBarElement.lua
@@ -482,9 +482,6 @@ end
 		name = "|c"..self.configColor..L["Text Settings"].."|r",
 		desc = L["Settings related to texts"],
 		order = 32,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
 		args = {
 			fontsize = {
 				type = 'range',
@@ -500,6 +497,9 @@ end
 				min = 8,
 				max = 20,
 				step = 1,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 11
 			},
 
@@ -514,6 +514,9 @@ end
 					self.moduleSettings.lockUpperTextAlpha = v
 					self:Redraw()
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 13
 			},
 
@@ -528,6 +531,9 @@ end
 					self.moduleSettings.lockLowerTextAlpha = v
 					self:Redraw()
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 13.1
 			},
 
@@ -542,6 +548,9 @@ end
 					self.moduleSettings.textVisible['upper'] = v
 					self:Redraw()
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 14
 			},
 
@@ -556,6 +565,9 @@ end
 					self.moduleSettings.textVisible['lower'] = v
 					self:Redraw()
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 15
 			},
 
@@ -578,6 +590,9 @@ end
 					self:RegisterFontStrings()
 					self:Redraw()
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				multiline = true,
 				usage = "<upper text to display>"
 			},
@@ -601,6 +616,9 @@ end
 					self:RegisterFontStrings()
 					self:Redraw()
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				multiline = true,
 				usage = "<lower text to display>"
 			},
@@ -668,9 +686,6 @@ if not self.moduleSettings.bHideMarkerSettings then
 		name = "|c"..self.configColor..L["Marker Settings"].."|r",
 		desc = L["Create or remove markers at various points along the bar here"],
 		order = 32,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
 		args = {
 			markerPos = {
 				type = "range",
@@ -685,6 +700,9 @@ if not self.moduleSettings.bHideMarkerSettings then
 				set = function(info, v)
 					lastMarkerPosConfig = math.floor(v)
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 20,
 			},
 			markerColor = {
@@ -698,6 +716,9 @@ if not self.moduleSettings.bHideMarkerSettings then
 				set = function(info, r, g, b, a)
 					lastMarkerColorConfig = {r=r, g=g, b=b, a=a}
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 30,
 			},
 			markerHeight = {
@@ -713,6 +734,9 @@ if not self.moduleSettings.bHideMarkerSettings then
 				set = function(info, v)
 					lastMarkerHeightConfig = v
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 40,
 			},
 			createMarker = {
@@ -723,6 +747,9 @@ if not self.moduleSettings.bHideMarkerSettings then
 				func = function()
 					self:AddNewMarker(lastMarkerPosConfig / 100, lastMarkerColorConfig, lastMarkerHeightConfig)
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 10,
 			},
 			listMarkers = {
@@ -748,6 +775,9 @@ if not self.moduleSettings.bHideMarkerSettings then
 					lastMarkerColorConfig = {r=color.r, g=color.g, b=color.b, a=color.a}
 					lastMarkerHeightConfig = self.moduleSettings.markers[v].height
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 50,
 			},
 			editMarker = {
@@ -759,6 +789,9 @@ if not self.moduleSettings.bHideMarkerSettings then
 						self:EditMarker(lastEditMarkerConfig, lastMarkerPosConfig / 100, lastMarkerColorConfig, lastMarkerHeightConfig)
 					end
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 60,
 			},
 			deleteMarker = {
@@ -770,6 +803,9 @@ if not self.moduleSettings.bHideMarkerSettings then
 						self:RemoveMarker(lastEditMarkerConfig)
 					end
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 70,
 			},
 		}
diff --git a/modules/PlayerHealth.lua b/modules/PlayerHealth.lua
index f08ae78..02f6f4d 100644
--- a/modules/PlayerHealth.lua
+++ b/modules/PlayerHealth.lua
@@ -328,9 +328,6 @@ function PlayerHealth.prototype:GetOptions()
 		type = 'group',
 		name = "|c"..self.configColor..L["Icon Settings"].."|r",
 		desc = L["Settings related to icons"],
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
 		args = {
 			iconConfigMode = {
 				type = "toggle",
@@ -343,6 +340,9 @@ function PlayerHealth.prototype:GetOptions()
 					configMode = v
 					self:EnteringWorld()
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 5
 			},
 
@@ -357,6 +357,9 @@ function PlayerHealth.prototype:GetOptions()
 					self.moduleSettings.lockIconAlpha = v
 					self:Redraw()
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 6
 			},
 
diff --git a/modules/TargetHealth.lua b/modules/TargetHealth.lua
index 9048537..d7213f5 100644
--- a/modules/TargetHealth.lua
+++ b/modules/TargetHealth.lua
@@ -186,9 +186,6 @@ end
 		type = 'group',
 		name = "|c"..self.configColor..L["Icon Settings"].."|r",
 		desc = L["Settings related to icons"],
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
 		args = {
 			iconConfigMode = {
 				type = "toggle",
@@ -204,6 +201,9 @@ end
 					self:CheckPartyRole()
 					self:Redraw()
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 5
 			},
 
@@ -218,6 +218,9 @@ end
 					self.moduleSettings.lockIconAlpha = v
 					self:Redraw()
 				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
 				order = 6
 			},