1 files changed, 3 insertions, 1 deletions
diff --git a/packages/website/ts/components/inputs/allowance_state_toggle.tsx b/packages/website/ts/components/inputs/allowance_state_toggle.tsx
index 764013682..4f986dadc 100644
--- a/packages/website/ts/components/inputs/allowance_state_toggle.tsx
+++ b/packages/website/ts/components/inputs/allowance_state_toggle.tsx
@@ -59,7 +59,7 @@ export class AllowanceStateToggle extends React.Component<AllowanceStateTogglePr
         const tooltipId = `tooltip-id-${this.props.token.symbol}`;
         return (
             <Container cursor="pointer">
-                <ReactTooltip effect="solid" offset={{ top: 3 }} id={tooltipId}>
+                <ReactTooltip id={tooltipId} effect="solid" offset={{ top: 3 }}>
                     {this._getTooltipContent()}
                 </ReactTooltip>
                 <div
@@ -114,6 +114,8 @@ export class AllowanceStateToggle extends React.Component<AllowanceStateTogglePr
         }
     }
     private async _onToggleAllowanceAsync(): Promise<void> {
+        // Close all tooltips
+        ReactTooltip.hide();
         if (this.props.userAddress === '') {
             this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true);
             return;