diff --git a/src/components/App.tsx b/src/components/App.tsx
index 5251482b..e778038e 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -1932,7 +1932,7 @@ class App extends React.Component<AppProps, AppState> {
     // zoom in at the right location on the touchMove handler already.
     // On Macbook, we don't have those events so will zoom in at the
     // current location instead.
-    if (gesture.pointers.size === 2) {
+    if (gesture.pointers.size >= 2) {
       return;
     }
 
diff --git a/src/components/Toolbar.scss b/src/components/Toolbar.scss
index b2aaeae3..d5c4374f 100644
--- a/src/components/Toolbar.scss
+++ b/src/components/Toolbar.scss
@@ -49,6 +49,7 @@
     .ToolIcon__hidden {
       box-shadow: none !important;
       background-color: transparent !important;
+      pointer-events: none !important;
     }
 
     .ToolIcon.ToolIcon__lock {