diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37038109..30d5ae35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 ==========
 
+Version 5.17.1 *(2023-01-06)*
+----------------------------
+
+ * Fixed a glitch with the top Search menu on some devices
+
 Version 5.17.0 *(2023-01-03)*
 ----------------------------
 
diff --git a/app/build.gradle b/app/build.gradle
index ab23e4d4..08e0620c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.simplemobiletools.smsmessenger"
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode 68
-        versionName "5.17.0"
+        versionCode 69
+        versionName "5.17.1"
         setProperty("archivesBaseName", "sms-messenger")
     }
 
@@ -63,7 +63,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:ae8c57858f'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:71f9297e2e'
     implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
     implementation 'com.github.tibbi:android-smsmms:33fcaf94d9'
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
index d869b7c4..604f443d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -141,21 +141,19 @@ class MainActivity : SimpleActivity() {
         main_menu.getToolbar().inflateMenu(R.menu.menu_main)
         main_menu.toggleHideOnScroll(true)
         main_menu.setupMenu()
-        main_menu.onSearchOpenListener = {
-            search_holder.fadeIn()
-            conversations_fab.beGone()
-        }
 
         main_menu.onSearchClosedListener = {
-            search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction {
-                search_holder.beGone()
-                searchTextChanged("", true)
-            }.start()
-
-            conversations_fab.beVisible()
+            fadeOutSearch()
         }
 
         main_menu.onSearchTextChangedListener = { text ->
+            if (text.isNotEmpty()) {
+                if (search_holder.alpha < 1f) {
+                    search_holder.fadeIn()
+                }
+            } else {
+                fadeOutSearch()
+            }
             searchTextChanged(text)
         }
 
@@ -380,6 +378,13 @@ class MainActivity : SimpleActivity() {
         }
     }
 
+    private fun fadeOutSearch() {
+        search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction {
+            search_holder.beGone()
+            searchTextChanged("", true)
+        }.start()
+    }
+
     @SuppressLint("NotifyDataSetChanged")
     private fun notifyDatasetChanged() {
         getOrCreateConversationsAdapter().notifyDataSetChanged()
diff --git a/fastlane/metadata/android/en-US/changelogs/69.txt b/fastlane/metadata/android/en-US/changelogs/69.txt
new file mode 100644
index 00000000..a67b5305
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/69.txt
@@ -0,0 +1 @@
+* Fixed a glitch with the top Search menu on some devices