1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index 51940f572..7b693c8da 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -267,7 +267,7 @@ export class KeyManager {
                     MainView.Instance.selectMenu(importBtn);
                 }
                 break;
-            case 't':
+            case 's':
                 const trailsBtn = DocListCast(Doc.MyLeftSidebarMenu.data).find(d => d.target === Doc.MyTrails);
                 if (trailsBtn) {
                     MainView.Instance.selectMenu(trailsBtn);
@@ -284,10 +284,10 @@ export class KeyManager {
                 }
                 break;
             case 'e':
-                Doc.ActiveTool = InkTool.Eraser;
+                Doc.ActiveTool = (Doc.ActiveTool === InkTool.Eraser ? InkTool.None : InkTool.Eraser);
                 break;
             case 'p':
-                Doc.ActiveTool = InkTool.Pen;
+                Doc.ActiveTool = (Doc.ActiveTool === InkTool.Pen ? InkTool.None : InkTool.Pen);
                 break;
             case 'r':
                 preventDefault = false;