diff --git a/packages/nicolium/src/components/media/media-gallery.tsx b/packages/nicolium/src/components/media/media-gallery.tsx
index 88b3aa4b4..164ccf098 100644
--- a/packages/nicolium/src/components/media/media-gallery.tsx
+++ b/packages/nicolium/src/components/media/media-gallery.tsx
@@ -117,19 +117,18 @@ const Item: React.FC<IItem> = ({
 
   // FIXME: wtf?
   const handleClick: React.MouseEventHandler = (e: any) => {
+    e.preventDefault();
+    e.stopPropagation();
+
     if (isIOS() && !e.target.autoPlay) {
       e.target.autoPlay = true;
-      e.preventDefault();
     } else if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       if (hoverToPlay()) {
         e.target.pause();
         e.target.currentTime = 0;
       }
-      e.preventDefault();
       onClick(index);
     }
-
-    e.stopPropagation();
   };
 
   const handleVideoHover: React.MouseEventHandler<HTMLVideoElement> = ({
diff --git a/packages/nicolium/src/modals/media-modal.tsx b/packages/nicolium/src/modals/media-modal.tsx
index c7babf6b7..d93c2c965 100644
--- a/packages/nicolium/src/modals/media-modal.tsx
+++ b/packages/nicolium/src/modals/media-modal.tsx
@@ -49,7 +49,9 @@ interface MediaModalProps {
 }
 
 const MediaModal: React.FC<MediaModalProps & BaseModalProps> = (props) => {
-  const { statusId, onClose, time = 0 } = props;
+  const { statusId, time = 0 } = props;
+
+  const onClose = () => props.onClose('MEDIA');
 
   const intl = useIntl();
 
@@ -301,7 +303,9 @@ const MediaModal: React.FC<MediaModalProps & BaseModalProps> = (props) => {
           style={wrapperStyles}
           className='⁂-media-modal__closer'
           role='presentation'
-          onClick={() => {
+          onClick={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
             onClose();
           }}
         >
@@ -318,9 +322,7 @@ const MediaModal: React.FC<MediaModalProps & BaseModalProps> = (props) => {
             <IconButton
               title={intl.formatMessage(messages.close)}
               src={iconX}
-              onClick={() => {
-                onClose('MEDIA');
-              }}
+              onClick={onClose}
               theme='dark'
               className='!p-1.5 hover:scale-105 hover:bg-gray-900'
               iconClassName='h-5 w-5'