diff --git a/src/fenrirscreenreader/commands/onKeyInput/80000-capslock.py b/src/fenrirscreenreader/commands/onKeyInput/80000-capslock.py
index 10db97e1..7d5723b6 100644
--- a/src/fenrirscreenreader/commands/onKeyInput/80000-capslock.py
+++ b/src/fenrirscreenreader/commands/onKeyInput/80000-capslock.py
@@ -19,9 +19,11 @@ class command():
         if self.env['input']['oldCapsLock'] == self.env['input']['newCapsLock']:
             return
         if self.env['input']['newCapsLock']:
-            self.env['runtime']['outputManager'].presentText(_("Capslock on"), interrupt=True)
+            oldKeyboardEcho = self.env['runtime']['outputManager'].presentText(_("Capslock on"), interrupt=True)
+            self.env['runtime']['settingsManager']('keyboard', 'charEcho') = True
         else:
             self.env['runtime']['outputManager'].presentText(_("Capslock off"), interrupt=True)
+            self.env['runtime']['settingsManager']('keyboard', 'charEcho') = oldKeyboardEcho
         
     def setCallback(self, callback):
         pass