diff --git a/exit-intent-popup.js b/exit-intent-popup.js
index 796f133..3955129 100644
--- a/exit-intent-popup.js
+++ b/exit-intent-popup.js
@@ -27,18 +27,36 @@ const CookieService = {
 </script>
 
 <script>
-const showExitIntentPopup = () => {
-    document.querySelector('.exit-intent-popup').classList.add('visible');
-    CookieService.setCookie('exitIntentShown', true, 30);
+const exit = e => {
+    const shouldExit =
+        [...e.target.classList].includes('exit-intent-popup') || // user clicks on mask
+        e.target.className === 'close' || // user clicks on the close icon
+        e.keyCode === 27; // user hits escape
+
+    if (shouldExit) {
+        document.querySelector('.exit-intent-popup').classList.remove('visible');
+    }
+};
+
+const mouseEvent = e => {
+    const shouldShowExitIntent = 
+        !e.toElement && 
+        !e.relatedTarget &&
+        e.clientY < 10;
+
+    if (shouldShowExitIntent) {
+        document.removeEventListener('mouseout', mouseEvent);
+        document.querySelector('.exit-intent-popup').classList.add('visible');
+
+        CookieService.setCookie('exitIntentShown', true, 30);
+    }
 };
 
 if (!CookieService.getCookie('exitIntentShown')) {
     setTimeout(() => {
-        showExitIntentPopup();
-    }, 2000); // Display after 2 seconds of page loading
-
-    document.querySelector('.exit-intent-popup').addEventListener('click', () => {
-        document.querySelector('.exit-intent-popup').classList.remove('visible');
-    });
+        document.addEventListener('mouseout', mouseEvent);
+        document.addEventListener('keydown', exit);
+        document.querySelector('.exit-intent-popup').addEventListener('click', exit);
+    }, 0);
 }
 </script>