diff --git a/src/components/browser/BrowserWindow.tsx b/src/components/browser/BrowserWindow.tsx
index 9f5cedc2..707776ec 100644
--- a/src/components/browser/BrowserWindow.tsx
+++ b/src/components/browser/BrowserWindow.tsx
@@ -1159,10 +1159,6 @@ export const BrowserWindow = () => {
         setShowAttributeModal(false);
         setSelectedElement(null);
         setAttributeOptions([]);
-
-        setTimeout(() => {
-        setShowAttributeModal(false);
-        }, 0);
     };
 
     const resetPaginationSelector = useCallback(() => {
diff --git a/src/components/ui/GenericModal.tsx b/src/components/ui/GenericModal.tsx
index a8d3c3e8..cdca071d 100644
--- a/src/components/ui/GenericModal.tsx
+++ b/src/components/ui/GenericModal.tsx
@@ -15,7 +15,7 @@ export const GenericModal: FC<ModalProps> = (
 
   return (
     <Modal open={isOpen} onClose={canBeClosed ? onClose : () => { }} >
-      <Box sx={modalStyle ? { ...modalStyle, boxShadow: 24, position: 'absolute', borderRadius: 5 } : defaultModalStyle}>
+      <Box sx={modalStyle ? { ...modalStyle, boxShadow: 24, position: 'absolute', borderRadius: 5 } : defaultModalStyle} onClick={(e) => e.stopPropagation()}>
         {canBeClosed ?
           <IconButton onClick={onClose} sx={{ float: "right" }}>
             <Clear sx={{ fontSize: 20 }} />