diff --git a/src/index.tsx b/src/index.tsx
index b7342e92..2a25ff0d 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -387,7 +387,11 @@ export class App extends React.Component<any, AppState> {
   };
 
   private onKeyDown = (event: KeyboardEvent) => {
-    if (isInputLike(event.target) && event.key !== KEYS.ESCAPE) {
+    if (
+      (isWritableElement(event.target) && event.key !== KEYS.ESCAPE) ||
+      // case: using arrows to move between buttons
+      (isArrowKey(event.key) && isInputLike(event.target))
+    ) {
       return;
     }
 
@@ -438,6 +442,9 @@ export class App extends React.Component<any, AppState> {
       if (!isHoldingSpace) {
         setCursorForShape(shape);
       }
+      if (document.activeElement instanceof HTMLElement) {
+        document.activeElement.blur();
+      }
       elements = clearSelection(elements);
       this.setState({ elementType: shape });
       // Undo action