diff --git a/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/component/ServicesAppBar.kt b/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/component/ServicesAppBar.kt
index 955ae206..43bcce55 100644
--- a/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/component/ServicesAppBar.kt
+++ b/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/component/ServicesAppBar.kt
@@ -152,11 +152,11 @@ private fun SearchBar(
         verticalAlignment = Alignment.CenterVertically
     ) {
 
-        AnimatedVisibility(visible = focused.not()) {
+        AnimatedVisibility(visible = focused.not() && query.isEmpty()) {
             TwImage(painter = painterResource(id = com.twofasapp.designsystem.R.drawable.logo_2fas), modifier = Modifier.size(24.dp))
         }
 
-        AnimatedVisibility(visible = focused) {
+        AnimatedVisibility(visible = focused || query.isNotEmpty()) {
             TwIcon(painter = TwIcons.Search, modifier = Modifier.size(24.dp))
         }