diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml
index 7246843f8..c6243c531 100644
--- a/mobile-widgets/qml/DiveDetails.qml
+++ b/mobile-widgets/qml/DiveDetails.qml
@@ -234,9 +234,16 @@ Kirigami.Page {
 			ScrollIndicator.horizontal: ScrollIndicator { }
 		}
 	}
-
-	DiveDetailsEdit {
-		id: detailsEdit
+	Flickable {
+		id: detailsEditFlickable
 		visible: diveDetailsPage.state != "view" ? true : false
+		anchors.fill: parent
+		leftMargin: Kirigami.Units.smallSpacing
+		rightMargin: Kirigami.Units.smallSpacing
+		contentHeight: detailsEdit.height
+		DiveDetailsEdit {
+			id: detailsEdit
+		}
+		ScrollBar.vertical: ScrollBar { }
 	}
 }
diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml
index 79bd5724e..143ebb8d2 100644
--- a/mobile-widgets/qml/DiveDetailsEdit.qml
+++ b/mobile-widgets/qml/DiveDetailsEdit.qml
@@ -73,7 +73,7 @@ Item {
 	}
 
 	height: editArea.height
-	width: diveDetailsPage.width - diveDetailsPage.leftPadding - diveDetailsPage.rightPadding
+	width: diveDetailsPage.width - diveDetailsPage.leftPadding - diveDetailsPage.rightPadding - Kirigami.Units.smallSpacing * 2
 	ColumnLayout {
 		id: editArea
 		spacing: Kirigami.Units.smallSpacing