diff --git a/views/layout.erb b/views/layout.erb
index 361f5139..43f09dab 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -68,6 +68,8 @@
             callback(suggestionObjects)
           })
         }
+      }).on('typeahead:selected', function(e) {
+        e.target.form.submit()
       })
     </script>
   </body>
diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb
index d7c27f82..74819441 100644
--- a/views/site_files/text_editor.erb
+++ b/views/site_files/text_editor.erb
@@ -16,6 +16,9 @@
 <div class="header-Outro">
   <div class="row content">
     <h1>Editing <%= @filename %></h1>
+    <% if @filename.match /index.html$/ %>
+      <h3 class="subtitle">Note: index.html is the first web page that gets loaded when users visit your site. Make sure there are <a href="http://www.w3schools.com/html/html_links.asp" target="_blank">HTML links</a> to your other pages from this page.</h3>
+    <% end %>
   </div>
 </div>
 
diff --git a/views/surf.erb b/views/surf.erb
index f778c422..ee05b7a0 100644
--- a/views/surf.erb
+++ b/views/surf.erb
@@ -132,6 +132,10 @@
       display: inline;
       font-size: 11px;
     }
+    .hidden {
+      display:none!important;
+      visibility:hidden
+    }
     </style>
   </head>
   <body>
@@ -154,7 +158,8 @@
         <li>
           <form id="search_criteria" onsubmit="getPage(1); return false">
             <input type="hidden" name="sort_by" value="<%= params[:sort_by] %>">
-            <input class="typeahead" name="tag" type="text" placeholder="Browse by tag..." value="<%= params[:tag] %>" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" dir="auto" />
+            <input class="typeahead" name="tag" type="text" placeholder="Browse by tag..." value="<%= params[:tag] %>" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" />
+            <input class="hidden" type="submit" tabindex="-1"/>
           </form>
         </li>
         <li>
@@ -220,6 +225,8 @@
           callback(suggestionObjects)
         })
       }
+    }).on('typeahead:selected', function(e) {
+      e.target.form.submit()
     })
 
     function toggleFollow(id) {
