diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/LocationDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/LocationDataFragment.kt
index 0213d3ba..2fc8c929 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/LocationDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/LocationDataFragment.kt
@@ -79,16 +79,10 @@ class LocationDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 	}
 
 	override fun editDescriptors(row: RowRepresentable): ArrayList<RowRepresentableEditDescriptor>? {
-		val data = java.util.ArrayList<RowRepresentableEditDescriptor>()
-		when (row) {
-			SimpleRow.NAME -> data.add(
-				RowRepresentableEditDescriptor(
-					location.name,
-					SimpleRow.NAME.resId
-				)
-			)
+		return when (row) {
+			SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.location.name))
+			else -> null
 		}
-		return data
 	}
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationRow.kt
index 23090d46..d1aa7b36 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/LocationRow.kt
@@ -2,12 +2,13 @@ package net.pokeranalytics.android.ui.view.rowrepresentable
 
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetType
+import net.pokeranalytics.android.ui.view.DefaultEditable
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.RowViewType
 
 
-enum class LocationRow : RowRepresentable {
+enum class LocationRow : RowRepresentable, DefaultEditable {
 	LOCATION_PERMISSION_SWITCH,
 	LOCATION_LOADER;