diff --git a/app/src/main/java/edu/temple/namelist/CustomAdapter.kt b/app/src/main/java/edu/temple/namelist/CustomAdapter.kt
index 0288b82..267216c 100644
--- a/app/src/main/java/edu/temple/namelist/CustomAdapter.kt
+++ b/app/src/main/java/edu/temple/namelist/CustomAdapter.kt
@@ -10,7 +10,7 @@ class CustomAdapter(private val names: List<String>, private val context: Contex
 
     // How many items are in the collection
     override fun getCount(): Int {
-        return 5
+        return names.size
     }
 
     // Fetch an item from the collection
diff --git a/app/src/main/java/edu/temple/namelist/MainActivity.kt b/app/src/main/java/edu/temple/namelist/MainActivity.kt
index f3a49f5..6e93014 100644
--- a/app/src/main/java/edu/temple/namelist/MainActivity.kt
+++ b/app/src/main/java/edu/temple/namelist/MainActivity.kt
@@ -37,8 +37,13 @@ class MainActivity : AppCompatActivity() {
         }
 
         findViewById<View>(R.id.deleteButton).setOnClickListener {
-            (names as MutableList).removeAt(spinner.selectedItemPosition)
-            (spinner.adapter as BaseAdapter).notifyDataSetChanged()
+            if (names.isNotEmpty()) {
+                (names as MutableList).removeAt(spinner.selectedItemPosition)
+                (spinner.adapter as BaseAdapter).notifyDataSetChanged()
+                if (names.isEmpty()) {
+                    nameTextView.text = ""
+                }
+            }
         }
 
     }