diff --git a/src/app/components/shared/questionwall/question-wall/question-wall.component.html b/src/app/components/shared/questionwall/question-wall/question-wall.component.html
index 09fd459a85d550dbb81b1b5b8a038b5b202c9b7f..e4bfc4f2e959fb31d928027c15fa373ef57a6281 100644
--- a/src/app/components/shared/questionwall/question-wall/question-wall.component.html
+++ b/src/app/components/shared/questionwall/question-wall/question-wall.component.html
@@ -18,24 +18,24 @@
             <button mat-menu-item (click)="sortScore(true)" aria-labelledby="sort-lbl-rating">{{'question-wall.sort-score' | translate}}</button>
           </mat-menu>
           <mat-menu #filterMenu>
-            <button mat-menu-item (click)="filterFavorites()" aria-labelledby="filter-lbl-favorites">
+            <button mat-menu-item (click)="filterFavorites()" aria-labelledby="filter-lbl-favorites" class="selection">
               <mat-icon class="star">grade</mat-icon>
               <span>{{'question-wall.filter-favorite' | translate}}</span>
             </button>
 
-            <button mat-menu-item (click)="filterBookmark()" aria-labelledby="filter-lbl-bookmark">
+            <button mat-menu-item (click)="filterBookmark()" aria-labelledby="filter-lbl-bookmark" class="selection">
               <mat-icon>bookmark</mat-icon>
               <span>{{'question-wall.filter-bookmark' | translate}}</span>
             </button>
           </mat-menu>
           <mat-menu #filterTagMenu>
-            <button mat-menu-item *ngFor="let tag of tags" (click)="filterTag(tag)">
+            <button mat-menu-item *ngFor="let tag of tags" (click)="filterTag(tag)" class="selection">
               <span>{{tag}}</span>
             </button>
           </mat-menu>
           <mat-menu #timeMenu="matMenu" xPosition="before">
             <div *ngFor="let periodItem of periodsList">
-              <button mat-menu-item (click)="setTimePeriod(periodItem)" class="period"
+              <button mat-menu-item (click)="setTimePeriod(periodItem)" class="period selection"
                       [ngClass]="{'selected': periodItem === period}"
                       aria-labelledby="{{periodItem}}">
                 <span>{{ ('comment-list.select-' + periodItem) | translate }}</span>
@@ -81,6 +81,7 @@
             <p>Filter</p>
           </button>
           <button ars-btn
+                  [disabled]="tags.length==0"
                   [mat-menu-trigger-for]="filterTagMenu"
                   [ngClass]="{'selected': hasFilter && filterTitle === '' && filterDesc !== ''}"
                   matRipple
diff --git a/src/app/components/shared/questionwall/question-wall/question-wall.component.scss b/src/app/components/shared/questionwall/question-wall/question-wall.component.scss
index 56653aab8fe296193c1f39a79d40efd93e428938..df024156e568c7d7ce0bf2726e503f730ddb5f0c 100644
--- a/src/app/components/shared/questionwall/question-wall/question-wall.component.scss
+++ b/src/app/components/shared/questionwall/question-wall/question-wall.component.scss
@@ -298,3 +298,7 @@
 .selected {
   font-weight: bold;
 }
+
+.selection:focus{
+  background-color: black !important;
+}