diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py
index eea1a692de..e9c9c149a7 100644
--- a/src/calibre/gui2/store/search/search.py
+++ b/src/calibre/gui2/store/search/search.py
@@ -28,6 +28,8 @@ class SearchDialog(QDialog, Ui_Dialog):
         self.setupUi(self)
 
         self.config = JSONConfig('store/search')
+        
+        self.search_edit.initialize('store_search_search')
 
         # We keep a cache of store plugins and reference them by name.
         self.store_plugins = istores
diff --git a/src/calibre/gui2/store/search/search.ui b/src/calibre/gui2/store/search/search.ui
index fe5aaceda4..8dd423baec 100644
--- a/src/calibre/gui2/store/search/search.ui
+++ b/src/calibre/gui2/store/search/search.ui
@@ -38,7 +38,14 @@
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="search_edit"/>
+      <widget class="HistoryLineEdit" name="search_edit">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
      </item>
      <item>
       <widget class="QPushButton" name="search">
@@ -201,6 +208,11 @@
    <extends>QTreeView</extends>
    <header>results_view.h</header>
   </customwidget>
+  <customwidget>
+   <class>HistoryLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>widgets.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../../../resources/images.qrc"/>