diff --git a/app/src/main/kotlin/ca/rmen/android/poetassistant/main/dictionaries/search/Search.kt b/app/src/main/kotlin/ca/rmen/android/poetassistant/main/dictionaries/search/Search.kt
index a856bfaa..30c81a04 100644
--- a/app/src/main/kotlin/ca/rmen/android/poetassistant/main/dictionaries/search/Search.kt
+++ b/app/src/main/kotlin/ca/rmen/android/poetassistant/main/dictionaries/search/Search.kt
@@ -23,7 +23,6 @@ import android.app.Activity
 import android.app.SearchManager
 import android.content.ContentValues
 import android.util.Log
-import android.view.View
 import androidx.annotation.MainThread
 import androidx.lifecycle.viewModelScope
 import androidx.recyclerview.widget.RecyclerView
@@ -69,12 +68,8 @@ class Search constructor(private val searchableActivity: Activity, private val v
     }
 
     fun setSearchView(searchView: SearchView, suggestionsViewModel: SuggestionsViewModel) {
-        // Workaround 1: On older versions (not sure which ones) of Android, the SearchView is partially
-        // covered by the status bar, unless we make this spacer view visible:
-        searchView.findViewById<View>(R.id.open_search_view_status_bar_spacer).visibility = View.VISIBLE
-
         searchView.hint =
-            searchableActivity.getString(R.string.search_hint) // Workaround 2: To hopefully prevent some crashes (!!) :(
+            searchableActivity.getString(R.string.search_hint) // To hopefully prevent some crashes (!!) :(
         // Step 1: Setup suggestions
         val suggestionsList: RecyclerView = searchView.findViewById(R.id.search_suggestions_list)
         val adapter = SuggestionsAdapter()
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 969d9a58..7fc803b6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -29,7 +29,6 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="true"
         tools:context=".main.MainActivity">
 
         <androidx.viewpager.widget.ViewPager