diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 305f1cd056ad38bb1952abf5be7a660704503a21..e52128557f0924b346c2b213d76f7bd59df2d57a 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -442,8 +442,9 @@ export class GenericCalculatorComponent extends BaseComponent implements OnInit,
         } else {
             newIndex = (newIndex + 1) % inputs.length;
         }
-        const elt = (inputs[newIndex] as HTMLElement);
+        const elt = (inputs[newIndex] as HTMLInputElement);
         elt.focus();
+        elt.select();
     }
 
     public openHelp() {