diff --git a/src/app/components/shared/comment-list/comment-list.component.ts b/src/app/components/shared/comment-list/comment-list.component.ts
index 231859ccc78af5650241bf1c2140cb851df33f2c..15aec46928b0d5b2cddd1a2ac2c1765678f20b87 100644
--- a/src/app/components/shared/comment-list/comment-list.component.ts
+++ b/src/app/components/shared/comment-list/comment-list.component.ts
@@ -493,6 +493,7 @@ export class CommentListComponent implements OnInit, OnDestroy {
   }
 
   votedComment(voteInfo: string) {
+    this.focusCommentId = null;
     setTimeout(() => this.focusCommentId = voteInfo, 100);
   }
 
diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index 04f2f9366d3ad6ef48421159ad88e21391edb838..b188d2f17cdeb2356e72335a867effc0b8aa9e74 100644
--- a/src/app/components/shared/comment/comment.component.html
+++ b/src/app/components/shared/comment/comment.component.html
@@ -369,7 +369,7 @@
               *ngFor="let keyword of sortKeywords(comment.keywordsFromQuestioner); let odd = odd; let even = even"
               [class.keywords-alternate]="odd"
               [class.keywords-even]="even">
-              <span (click)="this.clickedOnKeyword.emit(keyword.lemma)" class="keyword-span">{{keyword.lemma}}</span>
+              <span (click)="this.clickedOnKeyword.emit(keyword.text)" class="keyword-span">{{keyword.text}}</span>
             </mat-list-item>
           </mat-list>
         </mat-menu>