diff --git a/app/src/main/res/layout/content_editor.xml b/app/src/main/res/layout/content_editor.xml
index 46c3c9e20e..0df1c2023e 100644
--- a/app/src/main/res/layout/content_editor.xml
+++ b/app/src/main/res/layout/content_editor.xml
@@ -108,8 +108,7 @@
         <ViewFlipper
             android:id="@+id/editor_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="@dimen/editor_sheet_collapsed_height" />
+            android:layout_height="match_parent" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/no_editor_layout"
diff --git a/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt b/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt
index db908269e0..dd4eb5c0fe 100644
--- a/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt
+++ b/editor/src/main/java/com/itsaky/androidide/editor/ui/EditorSearchLayout.kt
@@ -31,6 +31,7 @@ import android.widget.PopupMenu
 import android.widget.PopupWindow
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import com.itsaky.androidide.editor.databinding.LayoutFindInFileBinding
 import com.itsaky.androidide.editor.ui.ReplaceAction.doReplace
 import com.itsaky.androidide.idetooltips.TooltipManager
@@ -49,17 +50,16 @@ import java.util.regex.Pattern
  */
 @SuppressLint("ViewConstructor") // Always created dynamically
 class EditorSearchLayout(context: Context, val editor: IDEEditor) : FrameLayout(context) {
+  private val collapsedSheetMargin =
+    context.resources.getDimensionPixelSize(R.dimen.editor_sheet_peek_height)
 
   private var searchInputTextWatcher: TextWatcher? = null
   private var searchOptions = SearchOptions(true, false)
-  private val findInFileBinding: LayoutFindInFileBinding
-  private val optionsMenu: PopupMenu
-
-  private var isSearching = false
+  private val findInFileBinding: LayoutFindInFileBinding = LayoutFindInFileBinding.inflate(LayoutInflater.from(context))
+    private val optionsMenu: PopupMenu
 
   init {
-    findInFileBinding = LayoutFindInFileBinding.inflate(LayoutInflater.from(context))
-    findInFileBinding.prev.setOnClickListener(::onSearchActionClick)
+      findInFileBinding.prev.setOnClickListener(::onSearchActionClick)
     findInFileBinding.next.setOnClickListener(::onSearchActionClick)
     findInFileBinding.replace.setOnClickListener(::onSearchActionClick)
     findInFileBinding.close.setOnClickListener(::onSearchActionClick)
@@ -115,6 +115,10 @@ class EditorSearchLayout(context: Context, val editor: IDEEditor) : FrameLayout(
         true
       }
     }
+    ViewCompat.setOnApplyWindowInsetsListener(findInFileBinding.root) { _, insets ->
+      updateActionsBottomMargin(insets.isVisible(WindowInsetsCompat.Type.ime()))
+      insets
+    }
 
     addView(
       findInFileBinding.root,
@@ -269,7 +273,7 @@ class EditorSearchLayout(context: Context, val editor: IDEEditor) : FrameLayout(
             try {
               Pattern.compile(it)
               it
-            } catch (error: Throwable) {
+            } catch (_: Throwable) {
               ""
             }
           } else {
@@ -282,4 +286,10 @@ class EditorSearchLayout(context: Context, val editor: IDEEditor) : FrameLayout(
       }
     }
   }
+
+  private fun updateActionsBottomMargin(isImeVisible: Boolean) {
+    findInFileBinding.actionsContainer.updateLayoutParams<MarginLayoutParams> {
+      bottomMargin = if (isImeVisible) 0 else collapsedSheetMargin
+    }
+  }
 }
diff --git a/editor/src/main/res/layout/layout_find_in_file.xml b/editor/src/main/res/layout/layout_find_in_file.xml
index 360ef55b98..1f3c8a48de 100644
--- a/editor/src/main/res/layout/layout_find_in_file.xml
+++ b/editor/src/main/res/layout/layout_find_in_file.xml
@@ -62,68 +62,62 @@
       app:layout_constraintTop_toTopOf="@id/search_input" />
 
 
-  <com.google.android.material.button.MaterialButton
-      android:id="@+id/prev"
-      style="@style/Widget.Material3.Button.TextButton"
+  <LinearLayout
+      android:id="@+id/actions_container"
       android:layout_width="0dp"
-      android:layout_height="40dp"
-      android:text="@string/previous"
-      android:textAllCaps="true"
-      android:minWidth="0dp"
-      android:paddingHorizontal="4dp"
-      app:layout_constraintEnd_toStartOf="@+id/next"
-      app:layout_constraintHorizontal_weight="0.25"
+      android:layout_height="wrap_content"
+      android:layout_marginBottom="0dp"
+      android:orientation="horizontal"
+      android:weightSum="4"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/search_input"
-      app:layout_constraintBottom_toBottomOf="parent" />
+      app:layout_constraintTop_toBottomOf="@id/search_input">
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/prev"
+        style="@style/Widget.Material3.Button.TextButton"
+        android:layout_width="0dp"
+        android:layout_height="40dp"
+        android:layout_weight="1"
+        android:minWidth="0dp"
+        android:paddingHorizontal="4dp"
+        android:text="@string/previous"
+        android:textAllCaps="true" />
 
-  <com.google.android.material.button.MaterialButton
-      android:id="@+id/next"
-      style="@style/Widget.Material3.Button.TextButton"
-      android:layout_width="0dp"
-      android:layout_height="40dp"
-      android:text="@string/next"
-      android:textAllCaps="true"
-      android:minWidth="0dp"
-      android:paddingHorizontal="4dp"
-      app:layout_constraintEnd_toStartOf="@+id/replace"
-      app:layout_constraintHorizontal_bias="0.5"
-      app:layout_constraintHorizontal_weight="0.25"
-      app:layout_constraintStart_toEndOf="@+id/prev"
-      app:layout_constraintTop_toBottomOf="@+id/search_input"
-      app:layout_constraintBottom_toBottomOf="parent" />
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/next"
+        style="@style/Widget.Material3.Button.TextButton"
+        android:layout_width="0dp"
+        android:layout_height="40dp"
+        android:layout_weight="1"
+        android:minWidth="0dp"
+        android:paddingHorizontal="4dp"
+        android:text="@string/next"
+        android:textAllCaps="true" />
 
-  <com.google.android.material.button.MaterialButton
-      android:id="@+id/replace"
-      style="@style/Widget.Material3.Button.TextButton"
-      android:layout_width="0dp"
-      android:layout_height="40dp"
-      android:text="@string/replace"
-      android:textAllCaps="true"
-      android:minWidth="0dp"
-      android:paddingHorizontal="4dp"
-      app:layout_constraintEnd_toStartOf="@+id/close"
-      app:layout_constraintHorizontal_bias="0.5"
-      app:layout_constraintHorizontal_weight="0.25"
-      app:layout_constraintStart_toEndOf="@+id/next"
-      app:layout_constraintTop_toBottomOf="@+id/search_input"
-      app:layout_constraintBottom_toBottomOf="parent" />
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/replace"
+        style="@style/Widget.Material3.Button.TextButton"
+        android:layout_width="0dp"
+        android:layout_height="40dp"
+        android:layout_weight="1"
+        android:minWidth="0dp"
+        android:paddingHorizontal="4dp"
+        android:text="@string/replace"
+        android:textAllCaps="true" />
 
-  <com.google.android.material.button.MaterialButton
-      android:id="@+id/close"
-      style="@style/Widget.Material3.Button.TextButton"
-      android:layout_width="0dp"
-      android:layout_height="40dp"
-      android:text="@string/btn_close"
-      android:textAllCaps="true"
-      android:minWidth="0dp"
-      android:paddingHorizontal="4dp"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintHorizontal_bias="0.5"
-      app:layout_constraintHorizontal_weight="0.25"
-      app:layout_constraintStart_toEndOf="@+id/replace"
-      app:layout_constraintTop_toBottomOf="@+id/search_input"
-      app:layout_constraintBottom_toBottomOf="parent" />
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/close"
+        style="@style/Widget.Material3.Button.TextButton"
+        android:layout_width="0dp"
+        android:layout_height="40dp"
+        android:layout_weight="1"
+        android:minWidth="0dp"
+        android:paddingHorizontal="4dp"
+        android:text="@string/btn_close"
+        android:textAllCaps="true" />
+
+  </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>