diff --git a/src/index.tsx b/src/index.tsx
index baaf2ef3..5dca0ff3 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -496,7 +496,12 @@ export class App extends React.Component<any, AppState> {
     return (
       <LockIcon
         checked={elementLocked}
-        onChange={() => this.setState({ elementLocked: !elementLocked })}
+        onChange={() => {
+          this.setState({
+            elementLocked: !elementLocked,
+            elementType: elementLocked ? "selection" : this.state.elementType,
+          });
+        }}
       />
     );
   }