diff --git a/gui/src/installer/view/editor/template/custom.rs b/gui/src/installer/view/editor/template/custom.rs
index ed58bbb9..f7a2a439 100644
--- a/gui/src/installer/view/editor/template/custom.rs
+++ b/gui/src/installer/view/editor/template/custom.rs
@@ -116,7 +116,7 @@ pub fn custom_template<'a>(
                                     color::GREEN,
                                     "Primary key",
                                     if use_taproot && !key.is_compatible_taproot {
-                                        Some("Key is not compatible with taproot")
+                                        Some("This device does not support Taproot")
                                     } else {
                                         None
                                     },
@@ -158,7 +158,7 @@ pub fn custom_template<'a>(
                                             color::ORANGE,
                                             "Recovery key",
                                             if use_taproot && !key.is_compatible_taproot {
-                                                Some("Key is not compatible with Taproot")
+                                                Some("This device does not support Taproot")
                                             } else {
                                                 None
                                             },
diff --git a/gui/src/installer/view/editor/template/inheritance.rs b/gui/src/installer/view/editor/template/inheritance.rs
index ce8d5db0..4716643f 100644
--- a/gui/src/installer/view/editor/template/inheritance.rs
+++ b/gui/src/installer/view/editor/template/inheritance.rs
@@ -115,7 +115,7 @@ pub fn inheritance_template<'a>(
                             color::GREEN,
                             "Primary key",
                             if use_taproot && !key.is_compatible_taproot {
-                                Some("Key is not compatible with Taproot")
+                                Some("This device does not support Taproot")
                             } else {
                                 None
                             },
@@ -142,7 +142,7 @@ pub fn inheritance_template<'a>(
                             color::WHITE,
                             "Inheritance key",
                             if use_taproot && !key.is_compatible_taproot {
-                                Some("Key is not compatible with taproot")
+                                Some("This device does not support Taproot")
                             } else {
                                 None
                             },
diff --git a/gui/src/installer/view/editor/template/multisig_security_wallet.rs b/gui/src/installer/view/editor/template/multisig_security_wallet.rs
index e7360c53..18576085 100644
--- a/gui/src/installer/view/editor/template/multisig_security_wallet.rs
+++ b/gui/src/installer/view/editor/template/multisig_security_wallet.rs
@@ -130,7 +130,7 @@ pub fn multisig_security_template<'a>(
                                     color::GREEN,
                                     format!("Primary key #{}", i + 1),
                                     if use_taproot && !key.is_compatible_taproot {
-                                        Some("Key is not compatible with taproot")
+                                        Some("This device does not support Taproot")
                                     } else {
                                         None
                                     },
@@ -178,7 +178,7 @@ pub fn multisig_security_template<'a>(
                                         color::GREEN,
                                         format!("Primary key #{}", j + 1),
                                         if use_taproot && !key.is_compatible_taproot {
-                                            Some("Key is not compatible with Taproot")
+                                            Some("This device does not support Taproot")
                                         } else {
                                             None
                                         },
@@ -189,7 +189,7 @@ pub fn multisig_security_template<'a>(
                                         color::ORANGE,
                                         "Recovery key".to_string(),
                                         if use_taproot && !key.is_compatible_taproot {
-                                            Some("Key is not compatible with Taproot")
+                                            Some("This device does not support Taproot")
                                         } else {
                                             None
                                         },
diff --git a/gui/src/installer/view/mod.rs b/gui/src/installer/view/mod.rs
index 45ad2eb5..3b281906 100644
--- a/gui/src/installer/view/mod.rs
+++ b/gui/src/installer/view/mod.rs
@@ -1560,8 +1560,6 @@ pub fn hw_list_view(
         } => {
             if chosen && processing {
                 hw::processing_hardware_wallet(kind, version.as_ref(), fingerprint, alias.as_ref())
-            } else if selected {
-                hw::selected_hardware_wallet(kind, version.as_ref(), fingerprint, alias.as_ref())
             } else if device_must_support_taproot
                 && !is_compatible_with_tapminiscript(kind, version.as_ref())
             {
@@ -1572,6 +1570,8 @@ pub fn hw_list_view(
                     alias.as_ref(),
                     "Device firmware version does not support taproot miniscript",
                 )
+            } else if selected {
+                hw::selected_hardware_wallet(kind, version.as_ref(), fingerprint, alias.as_ref())
             } else {
                 hw::supported_hardware_wallet(kind, version.as_ref(), fingerprint, alias.as_ref())
             }