diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 0da0c906b..a1029895f 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -195,15 +195,12 @@
           </div>
         </div>
 
-        <div id="searchLabel" class="left-inner-addon ">
+        <div class="left-inner-addon ">
           <i class="fi-magnifying-glass"></i>
-          <input name="search"
-                ng-click="home.searchInput()"
-                ng-focus="home.formFocus('search')"
-                ng-blur="home.formFocus(false)"
-                type="text"
-                placeholder="{{'Amount, address, mm/dd/yyyy' | translate}}"
-                ng-model="search"></input>
+          <input type="text"
+                class="form-control"
+                 placeholder="Amount, address, mm/dd/yyyy"
+                 ng-model="search"></input>
         </div>
         <div ng-repeat="btx in index.filter(search) track by btx.txid"
              fast-click callback-fn="home.openTxModal(btx)"
diff --git a/src/css/main.css b/src/css/main.css
index 6a9958b6f..9a61a84c2 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -796,6 +796,11 @@ table tbody tr:last-child td {
     padding: 5px;
     padding-left: 20px;
 }
+.left-inner-addon a {
+    position: absolute;
+    padding: 5px;
+    right: 0px;
+}
 
 /*////////////////////////////  BUTTON OUTLINE  ////////////////////////////*/
 
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index f8a2ada91..129722e60 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -916,6 +916,13 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     }, 100);
   };
 
+  self.hideHistory = function() {
+    if (!self.historyShowShowAll) {
+      self.txHistory = self.txHistory.slice(0, 10);
+      self.historyShowShowAll = true;
+    }
+  };
+
   self.filter = function(search) {
 
     function formatDate(date) {
@@ -1192,6 +1199,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r
     self.setAddressbook(ab);
   });
 
+  $rootScope.$on('Local/Searching', function(event, val) {
+    if (val) self.showAllHistory();
+    else self.hideHistory();
+  });
+
   // UX event handlers
   $rootScope.$on('Local/ColorUpdated', function(event) {
     self.updateColor();
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index da3246688..bf54bc800 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -24,6 +24,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   ret.isMobile = isMobile.any();
   ret.isWindowsPhoneApp = isMobile.Windows() && isCordova;
   var vanillaScope = ret;
+  this.isSearching = false;
 
   var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) {
     self.setForm(data);