diff --git a/www/js/controllers/wot-controllers.js b/www/js/controllers/wot-controllers.js
index e59cc250b3aedf6b69414ad48b7986be47c4ffc7..2ea5b05a04f57a25c212a25e2d65b92221a9b705 100644
--- a/www/js/controllers/wot-controllers.js
+++ b/www/js/controllers/wot-controllers.js
@@ -630,7 +630,7 @@ function WotIdentityAbstractController($scope, $rootScope, $state, $translate, $
 
   $scope.$on('$ionicView.beforeEnter', function (event, viewData) {
     // Enable back button (workaround need for navigation outside tabs - https://stackoverflow.com/a/35064602)
-    viewData.enableBack = UIUtils.screen.isSmall();
+    viewData.enableBack = UIUtils.screen.isSmall() ? true : viewData.enableBack;
   });
 
   $scope.load = function(pubkey, withCache, uid) {
diff --git a/www/plugins/es/js/controllers/registry-controllers.js b/www/plugins/es/js/controllers/registry-controllers.js
index b3b547b330cf8fbfba9c5936fe050fbde35d6d8f..ed39f52b9931f6b77d0f60de9bbacbd96b5405bb 100644
--- a/www/plugins/es/js/controllers/registry-controllers.js
+++ b/www/plugins/es/js/controllers/registry-controllers.js
@@ -788,7 +788,7 @@ function ESRegistryRecordViewController($scope, $rootScope, $state, $q, $timeout
 
   $scope.$on('$ionicView.beforeEnter', function (event, viewData) {
     // Enable back button (workaround need for navigation outside tabs - https://stackoverflow.com/a/35064602)
-    viewData.enableBack = UIUtils.screen.isSmall();
+    viewData.enableBack = UIUtils.screen.isSmall() ? true : viewData.enableBack;
   });
 
   $scope.$on('$ionicView.enter', function(e, state) {
diff --git a/www/plugins/map/js/controllers/registry-controllers.js b/www/plugins/map/js/controllers/registry-controllers.js
index dcb8bc02ad3f65e85735f91cb0781ecf7946a475..9efde6a6ea1f07351b0eb8d053b1dd4ca963056c 100644
--- a/www/plugins/map/js/controllers/registry-controllers.js
+++ b/www/plugins/map/js/controllers/registry-controllers.js
@@ -118,7 +118,7 @@ function MapRegistryViewController($scope, $filter, $templateCache, $interpolate
 
   $scope.$on('$ionicView.beforeEnter', function (event, viewData) {
     // Enable back button (workaround need for navigation outside tabs - https://stackoverflow.com/a/35064602)
-    viewData.enableBack = UIUtils.screen.isSmall();
+    viewData.enableBack = UIUtils.screen.isSmall() ? true : viewData.enableBack;
   });
 
   $scope.enter = function(e, state) {
diff --git a/www/plugins/map/js/controllers/wot-controllers.js b/www/plugins/map/js/controllers/wot-controllers.js
index 9eef90bcd162ecb959a5811c11887828facf8fb0..cb57dbf5efa2bb5febaba422cb456f498b044a2d 100644
--- a/www/plugins/map/js/controllers/wot-controllers.js
+++ b/www/plugins/map/js/controllers/wot-controllers.js
@@ -110,7 +110,7 @@ function MapWotViewController($scope, $filter, $templateCache, $interpolate, $ti
 
   $scope.$on('$ionicView.beforeEnter', function (event, viewData) {
     // Enable back button (workaround need for navigation outside tabs - https://stackoverflow.com/a/35064602)
-    viewData.enableBack = UIUtils.screen.isSmall();
+    viewData.enableBack = UIUtils.screen.isSmall() ? true : viewData.enableBack;
   });
 
   $scope.enter = function(e, state) {
diff --git a/www/templates/wot/lookup_form.html b/www/templates/wot/lookup_form.html
index 1879a5dc6c5d1355e90302fa8a5d2b56732e029a..151ffc37000a61a273037aaf052936388ff1715b 100644
--- a/www/templates/wot/lookup_form.html
+++ b/www/templates/wot/lookup_form.html
@@ -65,7 +65,6 @@
         <i class="icon ion-person-stalker"></i>
         {{'WOT.LOOKUP.BTN_NEWCOMERS' | translate}}
       </a>
-      &nbsp;
       <a ng-if="enableFilter"
          class="button button-text button-small ink"
          ng-class="{'button-text-positive': search.type=='pending'}"