diff --git a/src/app/browser/window/tab/item/identity/gemini.rs b/src/app/browser/window/tab/item/identity/gemini.rs
index f7ebdd35..15489826 100644
--- a/src/app/browser/window/tab/item/identity/gemini.rs
+++ b/src/app/browser/window/tab/item/identity/gemini.rs
@@ -67,7 +67,7 @@ impl Gemini {
                     };
 
                     // Init tooltip components
-                    let mut tooltip = format!("<b>Certificate</b>\n");
+                    let mut tooltip = "<b>Certificate</b>\n".to_string();
 
                     if let Some(subject_name) = certificate.subject_name() {
                         tooltip
@@ -110,7 +110,7 @@ impl Gemini {
                         scope.push(format!("<small>{}</small>", auth.scope.clone()))
                     }
 
-                    if scope.len() > 0 {
+                    if !scope.is_empty() {
                         tooltip.push_str(&format!("\n\n<b>Scope</b>\n\n{}", scope.join("\n")));
                     }
 
diff --git a/src/app/browser/window/tab/item/identity/gemini/widget/form/list/item.rs b/src/app/browser/window/tab/item/identity/gemini/widget/form/list/item.rs
index eafd397d..eff046e0 100644
--- a/src/app/browser/window/tab/item/identity/gemini/widget/form/list/item.rs
+++ b/src/app/browser/window/tab/item/identity/gemini/widget/form/list/item.rs
@@ -37,13 +37,7 @@ impl Item {
             )
             .property("title", title)
             .property("subtitle", subtitle)
-            .property(
-                "tooltip",
-                match tooltip {
-                    Some(text) => text,
-                    None => "", // NULL
-                },
-            )
+            .property("tooltip", tooltip.unwrap_or_default())
             .property("is_active", is_active)
             .build()
     }