diff --git a/src/app/shared/toolbar/toolbar.html b/src/app/shared/toolbar/toolbar.html
index 72ac45e..0f0305e 100644
--- a/src/app/shared/toolbar/toolbar.html
+++ b/src/app/shared/toolbar/toolbar.html
@@ -27,6 +27,7 @@
       <!-- search bar -->
       <ion-searchbar #searchbar animated
                      type="search"
+                     *ngIf="hasSearch"
                      [hidden]="!showSearchBar"
                      show-cancel-button="always"
                      (ionChange)="onSearch.emit($event)"
@@ -37,7 +38,7 @@
                   *ngIf="hasSearch && !showSearchBar">
         <ion-icon slot="icon-only" name="search"></ion-icon>
       </ion-button>
-      <ion-button (click)="onValidate.emit($event)" *ngIf="mobile && hasValidate">
+      <ion-button (click)="onValidate.emit($event)" *ngIf="hasValidate">
         <ion-icon slot="icon-only" name="checkmark"></ion-icon>
       </ion-button>
     </ion-buttons>
diff --git a/src/app/shared/toolbar/toolbar.ts b/src/app/shared/toolbar/toolbar.ts
index 2172838..d1a68c4 100644
--- a/src/app/shared/toolbar/toolbar.ts
+++ b/src/app/shared/toolbar/toolbar.ts
@@ -42,7 +42,7 @@ export class ToolbarComponent implements OnInit, OnDestroy {
   defaultBackHref: string;
 
   @Input()
-  hasValidate: boolean;
+  hasValidate = false;
 
   @Input()
   hasSearch: boolean;
@@ -78,7 +78,7 @@ export class ToolbarComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.mobile = toBoolean(this.mobile, this.platform.is('mobile'));
-    this.hasValidate = toBoolean(this.hasValidate, this.onValidate.observers.length > 0) && this.mobile;
+    this.hasValidate = this.hasValidate || this.onValidate.observers.length > 0 && this.mobile;
     this.hasSearch = toBoolean(this.hasSearch, this.onSearch.observers.length > 0);
     this.showSearchBar = false;
     this._subscription = this.progressBarService.onProgressChanged
diff --git a/src/app/wot/pages/wot-search.html b/src/app/wot/pages/wot-search.html
index 2721206..c4528fb 100644
--- a/src/app/wot/pages/wot-search.html
+++ b/src/app/wot/pages/wot-search.html
@@ -132,8 +132,8 @@
     <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
     <mat-row *matRowDef="let row; columns: displayedColumns;"
              class="mat-row-disabled"
-             (click)="clickRow($event, row)"></mat-row>
-  </mat-table>
+            ></mat-row>
+  </mat-table><!-- -- (click)="clickRow($event, row)" -->
 
   <!-- Paginator  -->
   <ion-row no-padding>