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 1047456f92767640bac3214c505647fa40dcc60e..08f1d823614da418d56f09df92399cab8cf2c28f 100755
--- a/Frontend Angular 4/src/app/layout/matefun/matefun.component.html	
+++ b/Frontend Angular 4/src/app/layout/matefun/matefun.component.html	
@@ -113,6 +113,11 @@
                                         <input type="checkbox" style="width: 15px; display: inline-block;" name="hintsCheck" class="form-control form-control-sm" [(ngModel)]=hintsCheck>
                                         {{ "i18n.msg.codemirror.showHints" | translate }}
                                     </label>
+                                    <br>
+                                    <label>
+                                        <input type="checkbox" style="width: 15px; display: inline-block;" name="typingCheck" class="form-control form-control-sm" [(ngModel)]=typingCheck>
+                                        {{ "i18n.msg.codemirror.functionTyping" | translate }}
+                                    </label>
                                 </div>
                                 <div class="form-group">
                                     <button class="btn btn-secondary" (click)="saveConfig(); popover.close();">{{ "i18n.action.save" | translate | titleCase }}</button>
diff --git a/Frontend Angular 4/src/app/layout/matefun/matefun.component.ts b/Frontend Angular 4/src/app/layout/matefun/matefun.component.ts
index 2a5070df9515a6192fc9fbafb98597ee751a4181..33af3cece0e946cbe28753eedee58cfeea1d99e7 100755
--- a/Frontend Angular 4/src/app/layout/matefun/matefun.component.ts	
+++ b/Frontend Angular 4/src/app/layout/matefun/matefun.component.ts	
@@ -79,6 +79,7 @@ export class MateFunComponent {
     argumentoI = false;
     argumentoF = false;
     hintsCheck = true;
+    typingCheck = true;
     editableLoaded = false;
     editDialogFired = false;
     archivosTree :any;
@@ -458,7 +459,8 @@ export class MateFunComponent {
     }
 
     clickEnEditor(event){
-        this.codemirror.instance.functionDefinition(this.archivo.nombre, this.codemirror.instance.doc, event);
+        if (this.typingCheck)
+            this.codemirror.instance.functionDefinition(this.archivo.nombre, this.codemirror.instance.doc, event);
     }
 
     guardarArchivo(){
diff --git a/Frontend Angular 4/src/assets/i18n/en.json b/Frontend Angular 4/src/assets/i18n/en.json
index 2e3194ff602ff7290895ffa004b1ee3567a835be..e9902a07af356c5b37d392872d98b940046fd7b6 100644
--- a/Frontend Angular 4/src/assets/i18n/en.json	
+++ b/Frontend Angular 4/src/assets/i18n/en.json	
@@ -73,7 +73,8 @@
                 "functionWarnings": "Show warnings of use of functions",
                 "infixOperatorsWarnings" : "Show warnings of use of infix operators",
                 "cursorPosition" : "Cursor position",
-                "showHints" : "Show autocomplete hints"
+                "showHints" : "Show autocomplete hints",
+                "functionTyping" : "Show functions typing"
             },
             "figure" : {
                 "multiPlot" : "Multi graph",
diff --git a/Frontend Angular 4/src/assets/i18n/es.json b/Frontend Angular 4/src/assets/i18n/es.json
index 62e28832691e8c4019ab6a9b1f12a76c51a687ae..323268ae201a5915ce0ce01db3949e3724c796cc 100644
--- a/Frontend Angular 4/src/assets/i18n/es.json	
+++ b/Frontend Angular 4/src/assets/i18n/es.json	
@@ -73,7 +73,8 @@
                 "functionWarnings": "Mostrar advertencias de uso de funciones",
                 "infixOperatorsWarnings" : "Mostrar advertencias de uso de operadores infijos",
                 "cursorPosition" : "Posición del cursor",
-                "showHints" : "Mostrar sugerencias de autocompletar"
+                "showHints" : "Mostrar sugerencias de autocompletar",
+                "functionTyping" : "Mostrar tipado de funciones"
             },
             "figure" : {
                 "multiPlot" : "Multi gráfica",