diff --git a/Frontend Angular 4/src/app/layout/matefun/codemirror/matefun-mode-EN.js b/Frontend Angular 4/src/app/layout/matefun/codemirror/matefun-mode-EN.js
index 7621f6378d7ad517ba6596db399eff309f1f90eb..91d3f599cda20f105b1c6dd4993c1e7a534c7691 100644
--- a/Frontend Angular 4/src/app/layout/matefun/codemirror/matefun-mode-EN.js	
+++ b/Frontend Angular 4/src/app/layout/matefun/codemirror/matefun-mode-EN.js	
@@ -51,7 +51,7 @@
     
     var re_digits = new RegExp(/^\d+$/, "g");
 
-    // not word = 'Enter'
+    // press 'Enter'
     if (options.key == 'Enter'){
       var previous_line = editor.getLine(cur.line - 1);
       var re_funs = new RegExp(FUNS.source, "g"), match;
@@ -79,6 +79,7 @@
       var re_w_s = new RegExp(WRITING_SET.source, "g");
       var re_w_c = new RegExp(WRITING_COMMENT.source, "g");
 
+      // no typing sets or comments
       if (!re_w_s.exec(previous_part) && !re_w_c.exec(previous_part)){
         // sets
         var re_dom = new RegExp(DOM.source, "g");
diff --git a/Frontend Angular 4/src/app/layout/matefun/matefun.component.html b/Frontend Angular 4/src/app/layout/matefun/matefun.component.html
index 2d8ca089b3dfa44c8f9a65a4b297b97fa1561951..be31779d5a40203b252915f26ed41f741ad59b92 100755
--- a/Frontend Angular 4/src/app/layout/matefun/matefun.component.html	
+++ b/Frontend Angular 4/src/app/layout/matefun/matefun.component.html	
@@ -119,8 +119,8 @@
                                 </div>
                             </div>
                         </ng-template>
-                        <ng-template #shortcutsPopoverContent style="width: 15em">
-                            <div style="width: 15em">
+                        <ng-template #shortcutsPopoverContent style="width: 18em">
+                            <div style="width: 18em">
                                 <div class="form-group">
                                     <label><b>Ctrl+P</b> {{ "i18n.shortcuts.runCode" | translate }}</label>
                                     <label><b>Ctrl+A</b> {{ "i18n.shortcuts.newFile" | translate }}</label>
@@ -129,6 +129,7 @@
                                     <label><b>Ctrl+R</b> {{ "i18n.shortcuts.restartInterpreter" | translate }}</label>
                                     <label><b>Ctrl+G</b> {{ "i18n.shortcuts.saveFile" | translate }}</label>
                                     <label><b>Ctrl+{{ "i18n.shortcuts.space" | translate }}</b> {{ "i18n.shortcuts.autocomplete" | translate }}</label>
+                                    <label><b>Ctrl+Shift+K</b> {{ "i18n.shortcuts.comment" | translate }}</label>
                                 </div>
                             </div>
                         </ng-template>
diff --git a/Frontend Angular 4/src/assets/i18n/en.json b/Frontend Angular 4/src/assets/i18n/en.json
index 1108717ae06a63f1164beb454e64ddeb96b13cbf..2e3194ff602ff7290895ffa004b1ee3567a835be 100644
--- a/Frontend Angular 4/src/assets/i18n/en.json	
+++ b/Frontend Angular 4/src/assets/i18n/en.json	
@@ -127,7 +127,8 @@
             "restartInterpreter" : "Restart interpreter",
             "saveFile" : "Save File",
             "autocomplete" : "Autocomplete",
-            "space" : "Space"
+            "space" : "Space",
+            "comment" : "Comment/Uncomment"
         }
     }
 }
diff --git a/Frontend Angular 4/src/assets/i18n/es.json b/Frontend Angular 4/src/assets/i18n/es.json
index 5df33f3a8b6efdc78fe7fafa045943ef98af8b45..62e28832691e8c4019ab6a9b1f12a76c51a687ae 100644
--- a/Frontend Angular 4/src/assets/i18n/es.json	
+++ b/Frontend Angular 4/src/assets/i18n/es.json	
@@ -127,7 +127,8 @@
             "restartInterpreter" : "Reiniciar intérprete",
             "saveFile" : "Guardar archivo",
             "autocomplete" : "Autocompletar",
-            "space" : "Espacio"
+            "space" : "Espacio",
+            "comment" : "Comentar/Descomentar"
         }
     }
 }