diff --git a/profile/defaults/bookmarks.html b/profile/defaults/bookmarks.html
index 46caa012..3ec9c3af 100644
--- a/profile/defaults/bookmarks.html
+++ b/profile/defaults/bookmarks.html
@@ -38,4 +38,6 @@ Do Not Edit! -->
         <DT><A HREF="http://news.google.com/">Google News</A>
     </DL><p>
     <HR>
+	<!-- Google search via "?" in the urlbar -->
+	<DT><A HREF="http://www.google.com/search?q=%s" ADD_DATE="1507679199" SHORTCUTURL="?" LAST_CHARSET="UTF-8" ID="rdf:#$DfKAE2">Internet Search</A>
 </DL><p>
diff --git a/xpfe/bootstrap/browser-prefs.js b/xpfe/bootstrap/browser-prefs.js
index abedc9c1..a183be6b 100644
--- a/xpfe/bootstrap/browser-prefs.js
+++ b/xpfe/bootstrap/browser-prefs.js
@@ -128,8 +128,8 @@ pref("browser.download.lastLocation", true);
 
 // various default search settings
 pref("browser.search.defaulturl", "chrome://navigator-region/locale/region.properties");
-pref("browser.search.opensidebarsearchpanel", true);
-pref("browser.search.opentabforcontextsearch", false);
+pref("browser.search.opensidebarsearchpanel", false);
+pref("browser.search.opentabforcontextsearch", true);
 pref("browser.search.last_search_category", "NC:SearchCategory?category=urn:search:category:1");
 pref("browser.search.mode", 0);
 // basic search popup constraint: minimum sherlock plugin version displayed