diff --git a/js/components/DiskII.tsx b/js/components/DiskII.tsx
index d20b7a9..fb97717 100644
--- a/js/components/DiskII.tsx
+++ b/js/components/DiskII.tsx
@@ -79,8 +79,8 @@ export const DiskII = ({ disk2, number, on, name, side }: DiskIIProps) => {
             <FileModal disk2={disk2} number={number} onClose={doClose} isOpen={modalOpen} />
             <ErrorModal error={error} setError={setError} />
             <div className={cs(styles.diskLight, { [styles.on]: on })} />
-            <button title="Load Disk">
-                <i className="fas fa-folder-open" onClick={onOpenModal} />
+            <button title="Load Disk" onClick={onOpenModal}>
+                <i className="fas fa-folder-open" />
             </button>
             <div className={styles.diskLabel}>
                 {label}
diff --git a/js/components/FileModal.tsx b/js/components/FileModal.tsx
index 8279a23..4ba5594 100644
--- a/js/components/FileModal.tsx
+++ b/js/components/FileModal.tsx
@@ -106,7 +106,7 @@ export const FileModal = ({ disk2, number, onClose, isOpen }: FileModalProps) =>
 
     return (
         <>
-            <Modal title="Open File" isOpen={isOpen}>
+            <Modal title="Open File" isOpen={isOpen} onClose={onClose}>
                 <ModalContent>
                     <div className={styles.loadModal}>
                         <select multiple onChange={doSelectCategory}>