diff --git a/mtda/assets/keysight.js b/mtda/assets/keysight.js
index 489b3d0a..482325a7 100644
--- a/mtda/assets/keysight.js
+++ b/mtda/assets/keysight.js
@@ -60,7 +60,7 @@
                 12: "num",
                 13: "\n",
                 16: "shift",
-                17: "meta",
+                17: "ctrl",
                 18: "alt",
                 19: "pause",
                 20: "caps",
@@ -156,7 +156,11 @@
             else var f = t.toUpperCase();
             return {
                 "char": f,
-                key: t
+                key: t,
+                ctrl: e.ctrlKey,
+                shift: e.shiftKey,
+                alt: e.altKey,
+                cmd: e.metaKey,
             }
         }, e.exports.unprintableKeys = {
             "\b": 1,
diff --git a/mtda/templates/index.html b/mtda/templates/index.html
index d30fa49b..d6589607 100644
--- a/mtda/templates/index.html
+++ b/mtda/templates/index.html
@@ -108,10 +108,15 @@
     <script src="./assets/keysight.js"></script>
     <script type=text/javascript>
       window.addEventListener("keydown", function(event) {
-        var key = keysight(event).char;
-        event.preventDefault();
-        console.log("#### <KEY> " + key);
-        $.getJSON('./keyboard-input', {input: key}, function(key) {
+        var key = keysight(event)
+        console.log("#### <KEY> " + JSON.stringify(key))
+        $.getJSON('./keyboard-input', {
+          input: key.char,
+          ctrl:  key.ctrl,
+          shift: key.shift,
+          alt:   key.alt,
+          meta:  key.cmd,
+        }, function(key) {
           // do nothing
         });
       });
diff --git a/mtda/www.py b/mtda/www.py
index 7daafc61..ad5c695c 100644
--- a/mtda/www.py
+++ b/mtda/www.py
@@ -104,7 +104,13 @@ def keyboard_input():
             if input in map:
                 map[input]()
         else:
-            mtda.keyboard.write(input)
+            mtda.keyboard.press(
+                input,
+                ctrl=request.args.get('ctrl', False, type=lambda s: s == 'true'),
+                shift=request.args.get('shift', False, type=lambda s: s == 'true'),
+                alt=request.args.get('alt', False, type=lambda s: s == 'true'),
+                meta=request.args.get('meta', False, type=lambda s: s == 'true')
+            )
     return ''