diff --git a/src/password_manager/manager.py b/src/password_manager/manager.py
index 14f64f6..b2a2452 100644
--- a/src/password_manager/manager.py
+++ b/src/password_manager/manager.py
@@ -1810,8 +1810,7 @@ class PasswordManager:
 
             self.display_entry_details(index)
 
-            if confirm_action("Show sensitive information? (y/N): "):
-                self.display_sensitive_entry_info(entry, index)
+            self.display_sensitive_entry_info(entry, index)
 
             pause()
             self._entry_actions_menu(index, entry)
@@ -2497,8 +2496,8 @@ class PasswordManager:
                 return
 
             self.display_sensitive_entry_info(entry, index)
-            self._entry_actions_menu(index, entry)
             pause()
+            self._entry_actions_menu(index, entry)
             return
         except Exception as e:
             logging.error(f"Error during password retrieval: {e}", exc_info=True)
diff --git a/src/tests/test_manager_list_entries.py b/src/tests/test_manager_list_entries.py
index 26ad712..6df3cb6 100644
--- a/src/tests/test_manager_list_entries.py
+++ b/src/tests/test_manager_list_entries.py
@@ -33,6 +33,8 @@ def test_handle_list_entries(monkeypatch, capsys):
         pm.backup_manager = backup_mgr
         pm.nostr_client = SimpleNamespace()
         pm.fingerprint_dir = tmp_path
+        pm.secret_mode_enabled = False
+        pm.secret_mode_enabled = False
 
         entry_mgr.add_totp("Example", TEST_SEED)
         entry_mgr.add_entry("example.com", 12)
@@ -111,6 +113,7 @@ def test_show_entry_details_by_index(monkeypatch):
         pm.backup_manager = backup_mgr
         pm.nostr_client = SimpleNamespace()
         pm.fingerprint_dir = tmp_path
+        pm.secret_mode_enabled = False
 
         index = entry_mgr.add_entry("example.com", 12)
 
@@ -135,6 +138,8 @@ def test_show_entry_details_by_index(monkeypatch):
         monkeypatch.setattr(
             "password_manager.manager.confirm_action", lambda *a, **k: False
         )
+        pm.password_generator = SimpleNamespace(generate_password=lambda l, i: "pw123")
+        monkeypatch.setattr(pm, "notify", lambda *a, **k: None)
 
         pm.show_entry_details_by_index(index)
 
@@ -167,9 +172,12 @@ def _detail_common(monkeypatch, pm):
         lambda *a, **k: None,
     )
     monkeypatch.setattr("password_manager.manager.pause", lambda *a, **k: None)
+    monkeypatch.setattr("builtins.input", lambda *a, **k: "")
     monkeypatch.setattr(
         "password_manager.manager.confirm_action", lambda *a, **k: False
     )
+    monkeypatch.setattr(pm, "notify", lambda *a, **k: None)
+    pm.password_generator = SimpleNamespace(generate_password=lambda l, i: "pw123")
     called = []
     monkeypatch.setattr(pm, "_entry_actions_menu", lambda *a, **k: called.append(True))
     return called