diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
index 0211a707d..8de58ab32 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
@@ -21,6 +21,7 @@ public class HomeHelper extends HelperBase {
     static final String PROP_SERVICES = "routerconsole.services";
     static final String PROP_FAVORITES = "routerconsole.favorites";
     static final String PROP_OLDHOME = "routerconsole.oldHomePage";
+    private static final String PROP_SEARCH = "routerconsole.showSearch";
 
     static final String DEFAULT_SERVICES =
         _x("Addressbook") + S + _x("Manage your I2P hosts file here (I2P domain name resolution)") + S + "/susidns/index" + S + I + "book_addresses.png" + S +
@@ -62,6 +63,10 @@ public class HomeHelper extends HelperBase {
         return _context.getProperty(Messages.PROP_LANG) == null;
     }
 
+    public boolean shouldShowSearch() {
+        return _context.getBooleanProperty(PROP_SEARCH);
+    }
+
     public String getServices() {
         List<App> plugins = NavHelper.getClientApps(_context);
         return homeTable(PROP_SERVICES, DEFAULT_SERVICES, plugins);
diff --git a/apps/routerconsole/jsp/confighome.jsp b/apps/routerconsole/jsp/confighome.jsp
index 14310c1df..ca0dbdc6c 100644
--- a/apps/routerconsole/jsp/confighome.jsp
+++ b/apps/routerconsole/jsp/confighome.jsp
@@ -40,6 +40,9 @@ input.default {
  <input type="submit" name="action" class="accept" value="<%=intl._("Save")%>" >
 </form>
 
+<%
+   if (homehelper.shouldShowSearch()) {
+%>
 <h3><%=intl._("Search Engines")%></h3>
 <form action="" method="POST">
  <input type="hidden" name="nonce" value="<%=pageNonce%>" >
@@ -53,6 +56,9 @@ input.default {
   <input type="submit" name="action" class="add" value="<%=intl._("Add item")%>" >
  </div>
 </form>
+<%
+   }  // shouldShowSearch()
+%>
 
 <h3><%=intl._("Recommended Eepsites")%></h3>
 <form action="" method="POST">
diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp
index 228842d1a..9d10c0084 100644
--- a/apps/routerconsole/jsp/home.jsp
+++ b/apps/routerconsole/jsp/home.jsp
@@ -89,6 +89,9 @@
 %>
 
 <div class="home" id="home">
+<%
+   if (homehelper.shouldShowSearch()) {
+%>
   <div class="search">
     <form action="/search.jsp" method="POST">
       <table class="search"><tr><td align="right">
@@ -102,6 +105,9 @@
       </td></tr></table>
     </form>
   </div>
+<%
+   }  // shouldShowSearch()
+%>
   <div class="ag2">
     <h4 class="app"><%=intl._("Eepsites of Interest")%></h4>
     <jsp:getProperty name="homehelper" property="favorites" /><br>