diff --git a/app/build.gradle b/app/build.gradle
index b1c63e587d..650a6db875 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2358
-        versionName "0.23.58"
+        versionCode 2359
+        versionName "0.23.59"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/survey/SurveyFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/survey/SurveyFragment.kt
index b4c6ae99e4..50fae59532 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/survey/SurveyFragment.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/survey/SurveyFragment.kt
@@ -6,6 +6,7 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
 import android.widget.AdapterView
+import android.widget.ArrayAdapter
 import android.widget.EditText
 import android.widget.RadioButton
 import android.widget.RadioGroup
@@ -84,6 +85,10 @@ class SurveyFragment : BaseRecyclerFragment<RealmStepExam?>(), SurveyAdoptListen
 
     private fun initializeViews(view: View) {
         spn = view.findViewById(R.id.spn_sort)
+        val adapter = ArrayAdapter.createFromResource(
+            requireContext(), R.array.sort_by_date, R.layout.spinner_text)
+        adapter.setDropDownViewResource(R.layout.spinner_text)
+        spn.adapter = adapter
         etSearch = requireView().findViewById(R.id.et_search)
         addNewSurvey = view.findViewById(R.id.fab_add_new_survey)
         rbTeamSurvey = view.findViewById(R.id.rbTeamSurvey)
diff --git a/app/src/main/res/layout/fragment_survey.xml b/app/src/main/res/layout/fragment_survey.xml
index dcd3a0f2e1..1f6363b716 100644
--- a/app/src/main/res/layout/fragment_survey.xml
+++ b/app/src/main/res/layout/fragment_survey.xml
@@ -54,17 +54,20 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:background="@color/secondary_bg">
+            android:background="@color/secondary_bg"
+            android:weightSum="1">
 
             <org.ole.planet.myplanet.utilities.CustomSpinner
                 android:id="@+id/spn_sort"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:entries="@array/sort_by_date"
                 android:padding="@dimen/padding_normal"
                 android:popupBackground="@color/secondary_bg"
                 android:backgroundTint="@color/daynight_textColor"
-                android:theme="@style/SpinnerItemStyle" />
+                android:theme="@style/SpinnerItemStyle"
+                android:spinnerMode="dialog"
+                android:layout_weight="0.6"/>
             <include
                 layout="@layout/layout_search"
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout/spinner_text.xml b/app/src/main/res/layout/spinner_text.xml
new file mode 100644
index 0000000000..dccd887181
--- /dev/null
+++ b/app/src/main/res/layout/spinner_text.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="10dp"
+    android:textSize="17sp"
+    android:maxLines="2"
+    android:ellipsize="none"
+    android:breakStrategy="simple"
+    android:textColor= "@color/daynight_textColor"/>