diff --git a/app/src/main/java/de/mlte/soundboard/EditActivity.kt b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
index 9500703..45da1bb 100644
--- a/app/src/main/java/de/mlte/soundboard/EditActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
@@ -9,12 +9,18 @@ import android.widget.Button
 import android.widget.EditText
 import android.provider.OpenableColumns
 import android.widget.TextView
+import kotlinx.android.synthetic.main.activity_edit.*
 
 class EditActivity : AppCompatActivity() {
 
     private fun displayFile() {
         val fileTextView = findViewById<TextView>(R.id.fileTextView)
-        currentUri?.let { uri -> fileTextView.setText(getFileName(uri)) }
+        currentUri?.let { uri ->
+            fileTextView.setText(getFileName(uri))
+            if (captionEditText.text.isBlank()) {
+                captionEditText.setText(fileTextView.text)
+            }
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -24,11 +30,14 @@ class EditActivity : AppCompatActivity() {
         val captionEditText = findViewById<EditText>(R.id.captionEditText)
         captionEditText.setText(intent.getStringExtra("caption"))
 
+        fileTextView.setText(intent.getStringExtra("fileName"))
+
         val okButton = findViewById<Button>(R.id.okButton)
         okButton.setOnClickListener {
             val data = Intent()
             data.putExtra("index", intent.getIntExtra("index", -1))
             data.putExtra("caption", captionEditText.text.toString())
+            data.putExtra("fileName", fileTextView.text.toString())
             if (currentUri != null) {
                 data.putExtra("uri", currentUri)
             }
diff --git a/app/src/main/java/de/mlte/soundboard/MainActivity.kt b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
index 261eb48..b24b185 100644
--- a/app/src/main/java/de/mlte/soundboard/MainActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
@@ -122,6 +122,7 @@ class MainActivity : AppCompatActivity() {
         val index = parent.indexOfChild(soundButton)
         intent.putExtra("index", index)
         intent.putExtra("caption", soundButton.textView.text)
+        intent.putExtra("fileName", soundButton.fileName)
         startActivityForResult(intent, 1234)
     }
 
@@ -138,6 +139,8 @@ class MainActivity : AppCompatActivity() {
             soundButton.textView.text = caption
             val soundId = preferences.getLong("soundId" + index, 0)
             soundButton.soundId = soundId
+            val fileName = preferences.getString("fileName" + index, "")
+            soundButton.fileName = fileName
         }
     }
 
@@ -162,18 +165,23 @@ class MainActivity : AppCompatActivity() {
                         textView.setText(caption)
                     }
                     val uri = data.getParcelableExtra<Uri>("uri")
-                    savePreferences(caption, uri, index)
+                    val fileName = data.getStringExtra("fileName")
+                    if (fileName != null) {
+                        button.fileName = fileName
+                    }
+                    savePreferences(uri, index)
                 }
             }
         }
     }
 
-    private fun savePreferences(caption: String, uri: Uri?, index: Int) {
+    private fun savePreferences(uri: Uri?, index: Int) {
         if (index > -1 && index < buttons.size) {
             val textView = buttons[index].textView
             val soundId = buttons[index].soundId
             val editor = getPreferences(Context.MODE_PRIVATE).edit()
             editor.putString("caption" + index, textView.text.toString())
+            editor.putString("fileName" + index, buttons[index].fileName)
             editor.commit()
 
             uri?.let { uri ->
diff --git a/app/src/main/java/de/mlte/soundboard/SoundButton.kt b/app/src/main/java/de/mlte/soundboard/SoundButton.kt
index 030e874..99e0706 100644
--- a/app/src/main/java/de/mlte/soundboard/SoundButton.kt
+++ b/app/src/main/java/de/mlte/soundboard/SoundButton.kt
@@ -14,6 +14,7 @@ class SoundButton : FrameLayout {
     val textView: TextView
     val objectAnimator: ObjectAnimator
     var soundId: Long = 0
+    var fileName: String = ""
 
     constructor(context: Context) : super(context) {
         View.inflate(context, R.layout.layout_button, this)