diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d8ad9dc3..8cf3a6c22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+Mobile: fix broken editing of location, suit, buddy, and dive master
 Mobile: fix missing translations on Android
 CSV export: support for multiple cylinders
 CSV import: support for multiple cylinders for Subsurface CSV files
diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml
index a888cfcd5..f5307786d 100644
--- a/mobile-widgets/qml/DiveDetailsEdit.qml
+++ b/mobile-widgets/qml/DiveDetailsEdit.qml
@@ -161,11 +161,6 @@ Item {
 				id: locationBox
 				editable: true
 				flat: true
-				contentItem: Text {
-					text: parent.displayText
-					color: subsurfaceTheme.textColor
-					verticalAlignment: Text.AlignVCenter
-				}
 				model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
 					manager.locationList : null
 				inputMethodHints: Qt.ImhNoPredictiveText
@@ -273,11 +268,6 @@ Item {
 				id: suitBox
 				editable: true
 				flat: true
-				contentItem: Text {
-					text: parent.displayText
-					color: subsurfaceTheme.textColor
-					verticalAlignment: Text.AlignVCenter
-				}
 				model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
 					manager.suitList : null
 				inputMethodHints: Qt.ImhNoPredictiveText
@@ -299,11 +289,6 @@ Item {
 			Controls.ComboBox {
 				id: buddyBox
 				editable: true
-				contentItem: Text {
-					text: parent.displayText
-					color: subsurfaceTheme.textColor
-					verticalAlignment: Text.AlignVCenter
-				}
 				model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
 					manager.buddyList : null
 				inputMethodHints: Qt.ImhNoPredictiveText
@@ -325,11 +310,6 @@ Item {
 			Controls.ComboBox {
 				id: divemasterBox
 				editable: true
-				contentItem: Text {
-					text: parent.displayText
-					color: subsurfaceTheme.textColor
-					verticalAlignment: Text.AlignVCenter
-				}
 				model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
 					manager.divemasterList : null
 				inputMethodHints: Qt.ImhNoPredictiveText
@@ -365,11 +345,6 @@ Item {
 			Controls.ComboBox {
 				id: cylinderBox0
 				flat: true
-				contentItem: Text {
-					text: parent.displayText
-					color: subsurfaceTheme.textColor
-					verticalAlignment: Text.AlignVCenter
-				}
 				model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
 					diveDetailsListView.currentItem.modelData.cylinderList : null
 				inputMethodHints: Qt.ImhNoPredictiveText
@@ -427,11 +402,6 @@ Item {
 				visible: usedCyl[1] != null ? true : false
 				id: cylinderBox1
 				flat: true
-				contentItem: Text {
-					text: parent.displayText
-					color: subsurfaceTheme.textColor
-					verticalAlignment: Text.AlignVCenter
-				}
 				model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
 					diveDetailsListView.currentItem.modelData.cylinderList : null
 				inputMethodHints: Qt.ImhNoPredictiveText
@@ -496,11 +466,6 @@ Item {
 				id: cylinderBox2
 				currentIndex: find(usedCyl[2])
 				flat: true
-				contentItem: Text {
-					text: parent.displayText
-					color: subsurfaceTheme.textColor
-					verticalAlignment: Text.AlignVCenter
-				}
 				model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
 					diveDetailsListView.currentItem.modelData.cylinderList : null
 				inputMethodHints: Qt.ImhNoPredictiveText
@@ -564,11 +529,6 @@ Item {
 				id: cylinderBox3
 				currentIndex: find(usedCyl[3])
 				flat: true
-				contentItem: Text {
-					text: parent.displayText
-					color: subsurfaceTheme.textColor
-					verticalAlignment: Text.AlignVCenter
-				}
 				model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
 					diveDetailsListView.currentItem.modelData.cylinderList : null
 				inputMethodHints: Qt.ImhNoPredictiveText
@@ -633,11 +593,6 @@ Item {
 				id: cylinderBox4
 				currentIndex: find(usedCyl[4])
 				flat: true
-				contentItem: Text {
-					text: parent.displayText
-					color: subsurfaceTheme.textColor
-					verticalAlignment: Text.AlignVCenter
-				}
 				model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
 					diveDetailsListView.currentItem.modelData.cylinderList : null
 				inputMethodHints: Qt.ImhNoPredictiveText