diff --git a/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss b/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
index 66c91b3f7f040f57e66e7914d77164054e44461a..09f756425cc41ece379423affb91493d8de00cec 100644
--- a/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
@@ -135,9 +135,9 @@ mat-hint {
 }
 
 .lang-confidence {
-  animation: shake 0.8s;
+  animation: shake 0.5s;
   color: var(--red);
-  font-size: 14px;
+  font-size: 16px;
 }
 
 @keyframes shake {
diff --git a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html
index 08b3bc3013287e77f429ab46f042b13c2203e701..284ed824d7f5c473f1b6461a0c633d9f22a66128 100644
--- a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html
+++ b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html
@@ -6,6 +6,7 @@
                       id="checkAll"
                       (change)="selectAll(checkall.checked)"
                       #checkall
+                      [checked]="allKeywordsSelected()"
                       matTooltip="{{ 'spacy-dialog.select-all-hint' | translate }}"
                       matTooltipShowDelay="750">
         </mat-checkbox>
diff --git a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
index 81d59bd1cb81e375e6fa720bdd3bf43f25fc872e..a6d4cf0a2ca01a363983d2869b49807eb6073d69 100644
--- a/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
+++ b/src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
@@ -26,7 +26,7 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit {
   keywords: Keyword[] = [];
   keywordsOriginal: Keyword[] = [];
   isLoading = false;
-  langSupported = true;
+  langSupported: boolean;
   manualKeywords = '';
 
   constructor(
@@ -40,10 +40,13 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit {
     this.comment = this.data.comment;
     this.commentLang = this.data.commentLang;
     this.commentBodyChecked = this.data.commentBodyChecked;
+    this.langSupported = this.commentLang !== 'auto';
   }
 
   ngAfterContentInit(): void {
-    this.evalInput(this.commentLang);
+    if(this.langSupported) {
+      this.evalInput(this.commentLang);
+    }
   }
 
   /**
@@ -116,6 +119,15 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit {
     }
   }
 
+  allKeywordsSelected(): boolean {
+    for(const kw of this.keywords) {
+      if(!kw.selected) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   manualKeywordsToKeywords(){
     const tempKeywords = this.manualKeywords.replace(/\s/g,'');
     if(tempKeywords.length) {