diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 0a02b6ee3f..02bb05f42e 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -164,14 +164,6 @@ endchoice
 config GUEST
 	bool
 
-config HYPERV_GUEST
-	bool "Hyper-V Guest"
-	select GUEST
-	---help---
-	  Support for Xen detecting when it is running under Hyper-V.
-
-	  If unsure, say N.
-
 config XEN_GUEST
 	bool "Xen Guest"
 	select GUEST
@@ -201,8 +193,7 @@ config PV_SHIM
 	  If unsure, say Y.
 
 config PV_SHIM_EXCLUSIVE
-	def_bool n
-	prompt "PV Shim Exclusive"
+	bool "PV Shim Exclusive"
 	depends on PV_SHIM
 	---help---
 	  Build Xen in a way which unconditionally assumes PV_SHIM mode.  This
@@ -211,6 +202,18 @@ config PV_SHIM_EXCLUSIVE
 
 	  If unsure, say N.
 
+if !PV_SHIM_EXCLUSIVE
+
+config HYPERV_GUEST
+	bool "Hyper-V Guest"
+	select GUEST
+	---help---
+	  Support for Xen detecting when it is running under Hyper-V.
+
+	  If unsure, say N.
+
+endif
+
 config MEM_SHARING
 	bool "Xen memory sharing support" if EXPERT = "y"
 	depends on HVM