diff --git a/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts b/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
index c44c9778382e1fb08506d94a8b7097a046bf93f7..f7fa11ced1b81987b8577bbba4d4b75549cca250 100644
--- a/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
@@ -85,7 +85,10 @@ export class CreateCommentComponent implements OnInit {
 
   openDeeplDialog(body: string, text: string, onClose: (data: string, text: string) => void) {
     this.generateDeeplDelta(body).subscribe(([improvedBody, improvedText]) => {
-      this.isSendingToSpacy = false;
+      if (improvedText.replace(/\s+/g, '') === text.replace(/\s+/g, '')) {
+        onClose(body, text);
+        return;
+      }
       this.dialog.open(DeepLDialogComponent, {
         width: '900px',
         maxWidth: '100%',
@@ -101,6 +104,8 @@ export class CreateCommentComponent implements OnInit {
       }).afterClosed().subscribe((res) => {
         if (res) {
           onClose(res.body, res.text);
+        } else {
+          this.isSendingToSpacy = false;
         }
       });
     }, (_) => {
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 68884ab37c7e7868ed04bd2564e140fde10cd2aa..ed46fd8e49743888ad00a1952d5792ec99713899 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
@@ -27,12 +27,12 @@
         <app-mat-spinner-overlay *ngIf="isLoading"></app-mat-spinner-overlay>
       </div>
       <mat-list dense class="keywords-list">
-        <mat-list-item  *ngFor="let keyword of keywords; let odd = odd; let even = even; let i = index"
-                        [class.keywords-alternate]="odd"
-                        [class.keywords-even]="even"
-                        [ngClass]="{'keyword-selected': keyword.selected, 'first-keyword': i === 0}">
+        <mat-list-item *ngFor="let keyword of keywords; let odd = odd; let even = even; let i = index"
+                       [class.keywords-alternate]="odd"
+                       [class.keywords-even]="even"
+                       [ngClass]="{'keyword-selected': keyword.selected, 'first-keyword': i === 0}">
           <span class="keyword-span" *ngIf="!keyword.editing">{{keyword.word}}</span>
-          <input  class="keyword-span, isEditing" *ngIf="keyword.editing" [(ngModel)]="keyword.word"/>
+          <input class="keyword-span, isEditing" *ngIf="keyword.editing" [(ngModel)]="keyword.word"/>
           <div class="keywords-actions">
             <mat-checkbox [checked]="keyword.completed"
                           (change)="keyword.selected = $event.checked"
@@ -49,7 +49,7 @@
             </button>
             <button *ngIf="keyword.editing"
                     (click)="onEndEditing(keyword); onEditChange(-1)" mat-icon-button
-                    class = "edit-accept"
+                    class="edit-accept"
                     matTooltip="{{ 'spacy-dialog.editing-done-hint' | translate }}"
                     matTooltipShowDelay="750">
               <mat-icon>check</mat-icon>
@@ -68,7 +68,7 @@
 </ars-row>
 
 <ars-row ars-flex-box class="action-button-container">
-  <ars-col>
+  <ars-col *ngIf="!isLoading && langSupported && hasKeywordsFromSpacy">
     <button
       mat-flat-button
       class="help-button"
@@ -77,6 +77,8 @@
       {{ 'explanation.label' | translate}}
     </button>
   </ars-col>
+  <ars-fill *ngIf="isLoading || !langSupported || !hasKeywordsFromSpacy">
+  </ars-fill>
   <ars-col>
     <app-dialog-action-buttons
       #appDialogActionButtons
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 9fe547e64ea57fb3a4473eefd7fd742b19ff5f70..390225ce22f092017684d5cb0c0b2228a80ee0fa 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
@@ -136,7 +136,7 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit {
   }
 
   manualKeywordsToKeywords() {
-    const tempKeywords = this.manualKeywords.replace(/\s/g, '');
+    const tempKeywords = this.manualKeywords.replace(/\s+/g, ' ');
     if (tempKeywords.length) {
       this.keywords = tempKeywords.split(',').map((keyword) => (
         {
diff --git a/src/app/components/shared/write-comment/write-comment.component.ts b/src/app/components/shared/write-comment/write-comment.component.ts
index 4a524a2bfae39a39f0283dcaec74cc33160d7277..2ddeee687f1269afac44cd494f735cd239302a6c 100644
--- a/src/app/components/shared/write-comment/write-comment.component.ts
+++ b/src/app/components/shared/write-comment/write-comment.component.ts
@@ -63,7 +63,7 @@ export class WriteCommentComponent implements OnInit {
                                maxTextCharacters: number,
                                maxDataCharacters: number): boolean {
     text = text.trim();
-    if (!text.length) {
+    if (text.length < 1 && data.length < 1) {
       translateService.get('comment-page.error-comment').subscribe(message => {
         notificationService.show(message);
       });