diff --git a/js/iD/controller/edit/NoSelection.js b/js/iD/controller/edit/NoSelection.js
index 97a11f16b..e4d4939c1 100755
--- a/js/iD/controller/edit/NoSelection.js
+++ b/js/iD/controller/edit/NoSelection.js
@@ -15,6 +15,10 @@ declare("iD.controller.edit.NoSelection", [iD.controller.ControllerState], {
 	constructor:function() {
 	},
 	
+	enterState:function() {
+		this.controller.stepper.hide();
+	},
+	
 	processMouseEvent:function(event,entityUI) {
 		this.inherited(arguments);
 		if (!entityUI) { return this; }
diff --git a/js/iD/controller/shape/DrawWay.js b/js/iD/controller/shape/DrawWay.js
index 6cbaa7782..f0dcc60e3 100644
--- a/js/iD/controller/shape/DrawWay.js
+++ b/js/iD/controller/shape/DrawWay.js
@@ -92,10 +92,12 @@ declare("iD.controller.shape.DrawWay", [iD.controller.ControllerState], {
 					// Click on node
 					if (entity==this.getDrawingNode()) {
 						// Double-click, so complete drawing
+						this.controller.stepper.highlight(3);
 						return new iD.controller.edit.SelectedWay(this.way);
 					} else if (entity==this.getStartNode()) {
 						// Start of this way, so complete drawing
 						this.appendNode(entity, this.undoAdder() );
+						this.controller.stepper.highlight(3);
 						return new iD.controller.edit.SelectedWay(this.way);
 					} else {
 						// Add to way