diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/ListViewAdapter.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/ListViewAdapter.kt
index c8f9052..aec5961 100644
--- a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/ListViewAdapter.kt
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/adapters/ListViewAdapter.kt
@@ -17,8 +17,10 @@ import vendor.eureka.hardware.fmradio.SetType
 
 class ListViewAdapter(private val mContext: Context) : BaseAdapter() {
     private val mFMInterface = NativeFMInterface()
-    private val mListChannel = mFMInterface.mDefaultCtl.getFreqsList()
+    private val mListChannel = mFMInterface.mDefaultCtl.getFreqsList().sort()
     private var mListofViews = HashMap<Int, View>(30)
+    private var mInitDoneArray = Array(30){ false }
+
     override fun getCount(): Int {
         return mListChannel.size
     }
@@ -63,9 +65,10 @@ class ListViewAdapter(private val mContext: Context) : BaseAdapter() {
                 it.setImageDrawable(mStar)
             }
         }
-        if (mFMInterface.mDefaultCtl.getValue(GetType.GET_TYPE_FM_FREQ) == mListChannel[id]) {
+        if (!mInitDoneArray[id] && mFMInterface.mDefaultCtl.getValue(GetType.GET_TYPE_FM_FREQ) == mListChannel[id]) {
             setCurrentFMChannel(id)
         }
+        mInitDoneArray[id] = true
         mListofViews[id] = mAnotherConvertView!!
         return mAnotherConvertView
     }
@@ -76,7 +79,7 @@ class ListViewAdapter(private val mContext: Context) : BaseAdapter() {
             mItem.value.setBackgroundColor(
                 ResourcesCompat.getColor(
                     mContext.resources,
-                    android.R.color.system_accent2_100,
+                    android.R.color.system_accent1_50,
                     mContext.theme
                 )
             )
@@ -84,7 +87,7 @@ class ListViewAdapter(private val mContext: Context) : BaseAdapter() {
         mListofViews[mPosition]?.setBackgroundColor(
             ResourcesCompat.getColor(
                 mContext.resources,
-                android.R.color.system_accent2_400,
+                android.R.color.system_accent1_300,
                 mContext.theme
             )
         )
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/MainFragment.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/MainFragment.kt
index 896bf91..0b69c4b 100644
--- a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/MainFragment.kt
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/fragments/MainFragment.kt
@@ -118,10 +118,10 @@ class MainFragment :
         mSeekBar.min = 1
         mSeekBar.max = 15
         mSeekBar.progress = mVolume
-        val mRestoreFreq = mSharedPref.getInt("freq", mFMInterface.mDevCtl.getValue(GetType.GET_TYPE_FM_LOWER_LIMIT))
-        mFMInterface.mDefaultCtl.setValue(SetType.SET_TYPE_FM_FREQ, mRestoreFreq)
-        mFMFreq.text = mCleanFormat.format(mRestoreFreq.toFloat() / 1000)
         if (!mFreqSearchDone) {
+           val mRestoreFreq = mSharedPref.getInt("freq", mFMInterface.mDevCtl.getValue(GetType.GET_TYPE_FM_LOWER_LIMIT))
+           mFMInterface.mDefaultCtl.setValue(SetType.SET_TYPE_FM_FREQ, mRestoreFreq)
+           mFMFreq.text = mCleanFormat.format(mRestoreFreq.toFloat() / 1000)
            mFMInterface.mDevCtl.setValue(SetType.SET_TYPE_FM_THREAD, 1)
            Toast.makeText(requireContext(), "Updating freqs list... Please wait", Toast.LENGTH_LONG).show()
            requireActivity().window.setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)