diff --git a/app/src/main/java/com/amaze/filemanager/ui/views/appbar/SearchView.java b/app/src/main/java/com/amaze/filemanager/ui/views/appbar/SearchView.java
index ee427be16f..25f305d007 100644
--- a/app/src/main/java/com/amaze/filemanager/ui/views/appbar/SearchView.java
+++ b/app/src/main/java/com/amaze/filemanager/ui/views/appbar/SearchView.java
@@ -391,6 +391,9 @@ public void revealSearchView() {
     } else {
       // TODO:ViewAnimationUtils.createCircularReveal
       animator = ObjectAnimator.ofFloat(searchViewLayout, "alpha", 0f, 1f);
+
+      searchViewLayout.bringToFront(); // since android:elevation won't work
+      searchViewEditText.requestFocus(); // for keyboard auto-popup
     }
 
     mainActivity.showSmokeScreen();
diff --git a/app/src/main/res/layout-w720dp/layout_search.xml b/app/src/main/res/layout-w720dp/layout_search.xml
index 5e1d907ae3..82da103193 100644
--- a/app/src/main/res/layout-w720dp/layout_search.xml
+++ b/app/src/main/res/layout-w720dp/layout_search.xml
@@ -8,6 +8,7 @@
     android:layout_margin="@dimen/search_view_margin"
     android:background="@drawable/search_view_shape"
     android:clickable="true"
+    android:elevation="8dp"
     android:focusable="true"
     android:visibility="gone">