diff --git a/app/src/main/java/de/mlte/soundboard/EditActivity.kt b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
index 6c1bb04..bd80c8e 100644
--- a/app/src/main/java/de/mlte/soundboard/EditActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
@@ -43,7 +43,7 @@ class EditActivity : AppCompatActivity() {
         captionEditText.setText(intent.getStringExtra("caption"))
 
         val fileName = intent.getStringExtra("fileName")
-        if (fileName.isEmpty()) fileTextView.text = "No file selected" else fileTextView.text = fileName
+        if (fileName.isEmpty()) fileTextView.text = "<No file selected>" else fileTextView.text = fileName
 
         val selectButton = findViewById<Button>(R.id.selectButton)
         selectButton.setOnClickListener {
@@ -55,9 +55,13 @@ class EditActivity : AppCompatActivity() {
         }
     }
 
+    private fun isCreate() = intent.getIntExtra("index", -1) < 0
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        val inflater = menuInflater
-        inflater.inflate(R.menu.edit, menu)
+        menuInflater.inflate(R.menu.edit, menu)
+        if (isCreate()) {
+            menu?.run{ findItem(R.id.delete).setVisible(false) }
+        }
         return true
     }
 
diff --git a/app/src/main/java/de/mlte/soundboard/MainActivity.kt b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
index f8f73a4..34fb967 100644
--- a/app/src/main/java/de/mlte/soundboard/MainActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
@@ -18,7 +18,6 @@ import java.io.BufferedOutputStream
 import android.os.IBinder
 import android.animation.AnimatorListenerAdapter
 import android.content.*
-import android.util.Log
 
 class MainActivity : AppCompatActivity() {
     private val buttons = ArrayList<SoundButton>()
@@ -111,9 +110,6 @@ class MainActivity : AppCompatActivity() {
             when (item.itemId) {
                 R.id.action_add_new -> {
                     val button = SoundButton(this)
-                    addButton(button)
-                    saveNumButtons()
-                    organizeButtons()
                     editButton(button)
                     return true
                 }
@@ -181,7 +177,8 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun addButton(soundButton: SoundButton) {
+    private fun createButton(): SoundButton {
+        val soundButton = SoundButton(this)
         buttons.add(soundButton)
 
         val parent = findViewById<GridLayout>(R.id.grid_layout)
@@ -200,6 +197,8 @@ class MainActivity : AppCompatActivity() {
             editButton(soundButton)
             true
         }
+
+        return soundButton
     }
 
     private fun editButton(soundButton: SoundButton) {
@@ -221,8 +220,7 @@ class MainActivity : AppCompatActivity() {
         val preferences = getPreferences(Context.MODE_PRIVATE)
         val numButtons = preferences.getInt("numButtons", 0)
         for (index in 0 until numButtons) {
-            val soundButton = SoundButton(this)
-            addButton(soundButton)
+            val soundButton = createButton()
             val caption = preferences.getString("caption" + index, "")
             soundButton.textView.text = caption
             val soundId = preferences.getLong("soundId" + index, 0)
@@ -232,35 +230,47 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun deleteButton(index: Int) {
+        val button = buttons[index]
+        deleteFile("audio" + button.soundId)
+        buttons.removeAt(index)
+        val parent = findViewById<GridLayout>(R.id.grid_layout)
+        parent.removeView(button)
+        saveNumButtons()
+        saveAllButtons()
+        organizeButtons()
+    }
+
+    private fun updateButton(index: Int, data: Intent) {
+        val button = buttons[index]
+        val textView = button.textView
+        val caption = data.getStringExtra("caption")
+        if (caption != null) {
+            textView.text = caption
+        }
+        val fileName = data.getStringExtra("fileName")
+        if (fileName != null) {
+            button.fileName = fileName
+        }
+        val uri = data.getParcelableExtra<Uri?>("uri")
+        uri?.let{ u -> saveAudio(u, index) }
+        saveButton(index)
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
         if (requestCode == 1234 && resultCode == Activity.RESULT_OK && data != null) {
             val index = data.getIntExtra("index", -1)
-            if (index > -1 && index < buttons.size) {
-                val button = buttons[index]
-                val textView = buttons[index].textView
-                if (data.getBooleanExtra("delete", false)) {
-                    deleteFile("audio" + buttons[index].soundId)
-                    buttons.removeAt(index)
-                    val parent = findViewById<GridLayout>(R.id.grid_layout)
-                    parent.removeView(button)
-                    saveNumButtons()
-                    saveAllButtons()
-                    organizeButtons()
-                } else {
-                    val caption = data.getStringExtra("caption")
-                    if (caption != null) {
-                        textView.text = caption
-                    }
-                    val uri = data.getParcelableExtra<Uri?>("uri")
-                    val fileName = data.getStringExtra("fileName")
-                    if (fileName != null) {
-                        button.fileName = fileName
-                    }
-                    uri?.let{ u -> saveAudio(u, index) }
-                    saveButton(index)
-                }
+            if (index < 0) {
+                createButton()
+                saveNumButtons()
+                organizeButtons()
+                updateButton(buttons.size - 1, data)
+            } else if (data.getBooleanExtra("delete", false)) {
+                deleteButton(index)
+            } else {
+                updateButton(index, data)
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
index 39d750e..97e8507 100644
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -49,7 +49,6 @@
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/input_layout"
         android:layout_marginLeft="16dp"
-        android:layout_toLeftOf="@id/selectButton"
-        android:text="@string/no_file_selected"/>
+        android:layout_toLeftOf="@id/selectButton"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a30fa2..1c5b87d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,5 +3,4 @@
     <string name="action_add_new">Add new</string>
     <string name="action_done">Done</string>
     <string name="action_delete">Delete</string>
-    <string name="no_file_selected">No file selected</string>
 </resources>