diff --git a/app/src/main/res/layout-land/main_activity_top_bar.xml b/app/src/main/res/layout-land/main_activity_top_bar.xml
index a03589f01..07a8abe9b 100644
--- a/app/src/main/res/layout-land/main_activity_top_bar.xml
+++ b/app/src/main/res/layout-land/main_activity_top_bar.xml
@@ -102,7 +102,7 @@
             android:adjustViewBounds="true"
             android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@{extraActionContentDescription}"
-            android:visibility="@{enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{!viewModel.searchBarVisible && enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toEndOf="parent"
@@ -147,6 +147,7 @@
                 android:layout_height="match_parent"
                 android:textCursorDrawable="@null"
                 android:textColor="?attr/color_on_main"
+                android:textColorHint="?attr/color_on_main"
                 android:textSize="16sp"
                 android:inputType="text"
                 android:paddingVertical="1dp"
diff --git a/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml b/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
index a77a1b5b0..30ad0d2ed 100644
--- a/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
+++ b/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
@@ -90,7 +90,7 @@
             android:adjustViewBounds="true"
             android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@{extraActionContentDescription}"
-            android:visibility="@{enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{!viewModel.searchBarVisible && enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toEndOf="parent"
@@ -135,6 +135,7 @@
                 android:layout_height="match_parent"
                 android:textCursorDrawable="@null"
                 android:textColor="?attr/color_text"
+                android:textColorHint="?attr/color_text"
                 android:textSize="16sp"
                 android:inputType="text"
                 android:paddingVertical="1dp"
diff --git a/app/src/main/res/layout/main_activity_top_bar.xml b/app/src/main/res/layout/main_activity_top_bar.xml
index 7a1108506..c4bb333cb 100644
--- a/app/src/main/res/layout/main_activity_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_top_bar.xml
@@ -102,7 +102,7 @@
             android:adjustViewBounds="true"
             android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@{extraActionContentDescription}"
-            android:visibility="@{enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
+            android:visibility="@{!viewModel.searchBarVisible && enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toEndOf="parent"
@@ -147,6 +147,7 @@
                 android:layout_height="match_parent"
                 android:textCursorDrawable="@null"
                 android:textColor="?attr/color_on_main"
+                android:textColorHint="?attr/color_on_main"
                 android:textSize="16sp"
                 android:inputType="text"
                 android:paddingVertical="1dp"