diff --git a/data/intro.yaml b/data/intro.yaml
index 13f7269a3..e14ba7814 100644
--- a/data/intro.yaml
+++ b/data/intro.yaml
@@ -1,8 +1,8 @@
 en:
   intro:
     navigation:
-      drag: "The main map area shows OpenStreetMap data on top of background imagery. You can navigate by dragging and scrolling, just like any web map. **Drag the map!**"
-      select: "Map features can be represented three ways: using points, lines or areas. All features can be selected by clicking on them. **Click on the point to select it.**"
+      drag: "The main map area shows OpenStreetMap data on top of a background. You can navigate by dragging and scrolling, just like any web map. **Drag the map!**"
+      select: "Map features are represented three ways: using points, lines or areas. All features can be selected by clicking on them. **Click on the point to select it.**"
       header: "The header shows us the feature type."
       pane: "The main pane shows the feature's attributes, such as its name and address."
     points:
@@ -15,7 +15,7 @@ en:
       close: "The feature editor can be closed by clicking on the close button. **Close the feature editor**"
       reselect: "Often points will already exist, but have mistakes or be incomplete. We can edit existing points. **Select the point you just created.**"
       fixname: "**Change the name and close the feature editor.**"
-      reselect_delete: "All features on the map can be deleted. **Reselect the point you created.**"
+      reselect_delete: "All features on the map can be deleted. **Click on the point you created.**"
       delete: "The menu around the point contains operations that can be performed on it, including delete. **Delete the point.**"
     areas:
       add: "Areas are a more detailed way to represent features. They provide information on the boundaries of the feature. Areas can be used for most features types points can be used for, and are often preferred. **Click the Area button to add a new area.**"
diff --git a/js/id/ui/intro/point.js b/js/id/ui/intro/point.js
index 54a0bb82b..73f82c79f 100644
--- a/js/id/ui/intro/point.js
+++ b/js/id/ui/intro/point.js
@@ -48,9 +48,14 @@ iD.ui.intro.point = function(context, reveal) {
         function keySearch() {
             var first = d3.select('.grid-button-wrap:first-child');
             if (first.datum().id === 'amenity/cafe') {
-                d3.select('.preset-grid-search').on('keyup.intro', null).node().blur();
                 reveal(first.select('.grid-entry').node(), 'intro.points.choose');
                 d3.selection.prototype.one.call(context.history(), 'change.intro', selectedPreset);
+
+                d3.select('.preset-grid-search').on('keydown.intro', function() {
+                    // Prevent search from updating and changing the grid
+                    d3.event.stopPropagation();
+                    d3.event.preventDefault();
+                }, true).on('keyup.intro', null);
             }
         }
 
@@ -63,6 +68,7 @@ iD.ui.intro.point = function(context, reveal) {
         }
 
         function closeEditor() {
+            d3.select('.preset-grid-search').on('keydown.intro', null);
             context.history().on('change.intro', null);
             reveal('.tag-pane', 'intro.points.close');
         }
@@ -132,7 +138,7 @@ iD.ui.intro.point = function(context, reveal) {
         context.on('enter.intro', null);
         context.map().on('move.intro', null);
         context.history().on('change.intro', null);
-        d3.select('.preset-grid-search').on('keyup.intro', null);
+        d3.select('.preset-grid-search').on('keyup.intro', null).on('keydown.intro', null);
     };
 
     return d3.rebind(step, event, 'on');