diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml
index e3d07f8f..720d16fe 100644
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@@ -3369,28 +3369,8 @@
 
 	If showShotEnable = "Press" Then
 		Var showShotEnable = "Enable"
-
-		If TOPPING7 = "water-level" Then
-			Var showCustomCoffee = "Enable"
-		EndIf
-
-		If TOPPING8 = "coffee-quantity" Then
-			Var showCustomCoffee = "Enable"
-		EndIf
-
-		If TOPPING9 = "single-shot-espv2" Then
-			Var showCustomCoffee = "Enable"
-		EndIf
-
-		If TOPPING10 = "tampping-espv2" Then
-			Var showCustomCoffee = "Enable"
-		EndIf
-
 	Else
 		Var showShotEnable = "Press"
-
-		; Invisible showCustomCoffee
-		Var showCustomCoffee = "Invisible"
 	EndIf
 
 	Function 2
@@ -3422,27 +3402,8 @@
 	If showShotEnable = "Press" Then
 		Var showShotEnable = "Enable"
 
-		If TOPPING7 = "water-level" Then
-			Var showCustomCoffee = "Enable"
-		EndIf
-
-		If TOPPING8 = "coffee-quantity" Then
-			Var showCustomCoffee = "Enable"
-		EndIf
-
-		If TOPPING9 = "single-shot-espv2" Then
-			Var showCustomCoffee = "Enable"
-		EndIf
-
-		If TOPPING10 = "tampping-espv2" Then
-			Var showCustomCoffee = "Enable"
-		EndIf
-
 	Else
 		Var showShotEnable = "Press"
-
-		; Invisible showCustomCoffee
-		Var showCustomCoffee = "Invisible"
 	EndIf
 
 	Function 2
@@ -5392,6 +5353,27 @@
 	DEBUGVAR showCustomCoffee
 	DEBUGVAR CustomCoffeeDefault
 
+	If showShotEnable = "Press" Then
+		; Invisible showCustomCoffee
+		Var showCustomCoffee = "Invisible"
+	Else
+		If TOPPING7 = "water-level" Then
+			Var showCustomCoffee = "Enable"
+		EndIf
+
+		If TOPPING8 = "coffee-quantity" Then
+			Var showCustomCoffee = "Enable"
+		EndIf
+
+		If TOPPING9 = "single-shot-espv2" Then
+			Var showCustomCoffee = "Enable"
+		EndIf
+
+		If TOPPING10 = "tampping-espv2" Then
+			Var showCustomCoffee = "Enable"
+		EndIf
+	EndIf
+
 	If showCustomCoffee = "Enable" Then
 
 		If showCoffeeWater = "Enable" Then