diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatEntryAdapter.kt b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatEntryAdapter.kt
index 6842c192..5a3513f5 100755
--- a/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatEntryAdapter.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/adapters/SatEntryAdapter.kt
@@ -48,6 +48,10 @@ class SatEntryAdapter(private var entries: MutableList<SatEntry>) :
         notifyDataSetChanged()
     }
 
+    fun getEntries(): MutableList<SatEntry> {
+        return entries
+    }
+
     inner class SatEntryHolder(itemView: View, private val binding: ItemSatEntryBinding) :
         RecyclerView.ViewHolder(itemView) {
 
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt
index 459c1f57..0187cf79 100644
--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/PolarViewFragment.kt
@@ -57,9 +57,8 @@ class PolarViewFragment : Fragment(R.layout.fragment_polar_view), SensorEventLis
     private lateinit var viewModel: SharedViewModel
     private lateinit var binding: FragmentPolarViewBinding
     private lateinit var satPass: SatPass
-    private lateinit var polarView: PolarView
     private lateinit var sensorManager: SensorManager
-
+    private var polarView: PolarView? = null
     private val args: PolarViewFragmentArgs by navArgs()
     private val transmitterAdapter = TransmitterAdapter()
     private var lastAccData = FloatArray(3)
@@ -114,7 +113,7 @@ class PolarViewFragment : Fragment(R.layout.fragment_polar_view), SensorEventLis
                 val orientation = FloatArray(3)
                 SensorManager.getOrientation(rotationMatrix, orientation)
                 val degree = orientation[0] * 57.2957795f
-                polarView.rotation = -degree
+                polarView?.rotation = -degree
             }
         }
     }
@@ -159,7 +158,7 @@ class PolarViewFragment : Fragment(R.layout.fragment_polar_view), SensorEventLis
         refreshJob = lifecycleScope.launch {
             while (true) {
                 setPassText()
-                polarView.invalidate()
+                polarView?.invalidate()
                 delay(rate)
             }
         }
diff --git a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/SatEntryDialogFragment.kt b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/SatEntryDialogFragment.kt
index fce91ef1..c21defe6 100755
--- a/app/src/main/java/com/rtbishop/look4sat/ui/fragments/SatEntryDialogFragment.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/ui/fragments/SatEntryDialogFragment.kt
@@ -110,12 +110,14 @@ class SatEntryDialogFragment(private var entries: MutableList<SatEntry>) :
 
     private fun onNeutralClicked() {
         selectAllToggle = if (selectAllToggle) {
-            entries.forEach { it.isSelected = true }
-            entryAdapter.setEntries(entries)
+            val currentList = entryAdapter.getEntries()
+            currentList.forEach { it.isSelected = true }
+            entryAdapter.setEntries(currentList)
             false
         } else {
-            entries.forEach { it.isSelected = false }
-            entryAdapter.setEntries(entries)
+            val currentList = entryAdapter.getEntries()
+            currentList.forEach { it.isSelected = false }
+            entryAdapter.setEntries(currentList)
             true
         }
     }