diff --git a/qml/DepthAxis.qml b/qml/DepthAxis.qml
index c55057496..5b55aedbb 100644
--- a/qml/DepthAxis.qml
+++ b/qml/DepthAxis.qml
@@ -81,6 +81,30 @@ Item {
         }
     }
 
+    Component {
+        id: extendedTickMark
+        RowLayout {
+            anchors.right: parent.right
+            height: lastIndex ? remainingHeight() : nominalHeight()
+            width: root.width
+
+            Layout.fillHeight: true
+            Layout.alignment: Qt.AlignRight | Qt.AlignBottom
+
+            property var lastIndex: (index + 1) == numTicks
+                Rectangle {
+                    id: extendedTick
+                    width: root.width
+                    height: 1
+                    Layout.alignment: Qt.AlignRight | Qt.AlignBottom
+                    color: root.color
+                    border.color: root.color
+                    border.width: 1
+                    visible: parent.height > 0
+                }
+        }
+    }
+
     Component {
         id: tickLabel
         RowLayout {
@@ -124,6 +148,14 @@ Item {
         }
     }
 
+    Column {
+        anchors.fill:parent
+        Repeater {
+            model: numTicks
+            delegate: extendedTickMark
+        }
+    }
+
     Column {
         anchors.fill:parent
         Repeater {
diff --git a/qml/Ping1DVisualizer.qml b/qml/Ping1DVisualizer.qml
index 0dd98bbc9..ac5f5ff57 100644
--- a/qml/Ping1DVisualizer.qml
+++ b/qml/Ping1DVisualizer.qml
@@ -87,6 +87,7 @@ Item {
             DepthAxis {
                 id: depthAxis
                 anchors.fill: parent
+                width: waterfall.width
                 start_mm: waterfall.minDepthToDraw
                 end_mm: waterfall.maxDepthToDraw
                 visible: start_mm != end_mm