diff --git a/src/components/ManualUploadModal.js b/src/components/ManualUploadModal.js
index c793e19..c9dd413 100644
--- a/src/components/ManualUploadModal.js
+++ b/src/components/ManualUploadModal.js
@@ -28,7 +28,17 @@ const ManualUploadModal = ({ isOpen, onClose }) => {
   const { applyHorariosSIU, getPeriodosSIU } = React.useContext(DataContext);
 
   return (
-    <Modal isOpen={isOpen} onClose={onClose} size="lg">
+    <Modal
+      isOpen={isOpen}
+      onClose={onClose}
+      size="lg"
+      onCloseComplete={() => {
+        setError("");
+        setSiuData("");
+        setPeriodosOptions([]);
+        setSelectedPeriod(null);
+      }}
+    >
       <ModalOverlay />
       <ModalContent borderWidth="2px" borderColor="primary.500">
         <ModalHeader>Importar horarios del SIU</ModalHeader>
@@ -68,12 +78,61 @@ const ManualUploadModal = ({ isOpen, onClose }) => {
               <Kbd>V</Kbd>).
             </ListItem>
           </OrderedList>
-          <form
-            onSubmit={
-              periodosOptions.length > 0
-                ? (t) => {
-                    t.preventDefault();
-                    applyHorariosSIU(selectedPeriod);
+          <Textarea
+            my={1}
+            size="sm"
+            name="siu"
+            onChange={(e) => setSiuData(e.target.value)}
+            value={siuData}
+          />
+          {periodosOptions.length > 0 && (
+            <Select
+              borderColor="tomato"
+              borderWidth={2}
+              placeholder="Elegir período lectivo"
+              my={2}
+              onChange={(e) => setSelectedPeriod(e.target.value)}
+            >
+              {periodosOptions.map((p) => (
+                <option key={p.periodo} value={p.periodo}>
+                  {p.periodo} (Materias: {p.materias.length})
+                </option>
+              ))}
+            </Select>
+          )}
+          {periodosOptions.length > 0 ? (
+            <Button
+              w="100%"
+              colorScheme="primary"
+              isDisabled={!selectedPeriod}
+              onClick={() => {
+                const periodo = periodosOptions.find(
+                  (p) => p.periodo === selectedPeriod
+                );
+                applyHorariosSIU(periodo);
+                onClose();
+                toast({
+                  title: "Horarios del SIU aplicados",
+                  status: "success",
+                  duration: 2000,
+                  isClosable: true,
+                });
+              }}
+            >
+              Aplicar horarios
+            </Button>
+          ) : (
+            <Button
+              w="100%"
+              colorScheme="primary"
+              isDisabled={!siuData}
+              onClick={() => {
+                try {
+                  const periodos = getPeriodosSIU(siuData);
+                  if (periodos.length > 1) {
+                    setPeriodosOptions(periodos);
+                  } else {
+                    applyHorariosSIU(periodos[0]);
                     onClose();
                     toast({
                       title: "Horarios del SIU aplicados",
@@ -82,69 +141,19 @@ const ManualUploadModal = ({ isOpen, onClose }) => {
                       isClosable: true,
                     });
                   }
-                : (t) => {
-                    t.preventDefault();
-                    try {
-                      const periodos = getPeriodosSIU(siuData);
-                      if (periodos.length > 1) {
-                        setPeriodosOptions(periodos);
-                      } else {
-                        applyHorariosSIU(periodos[0]);
-                        onClose();
-                        toast({
-                          title: "Horarios del SIU aplicados",
-                          status: "success",
-                          duration: 2000,
-                          isClosable: true,
-                        });
-                      }
-                    } catch (e) {
-                      setError(e.message);
-                    }
-                  }
-            }
-          >
-            <Textarea
-              my={1}
-              size="sm"
-              name="siu"
-              onChange={(e) => setSiuData(e.target.value)}
-              value={siuData}
-            />
-            {periodosOptions.length > 0 && (
-              <Select
-                borderColor="tomato"
-                borderWidth={2}
-                placeholder="Elegir período lectivo"
-                my={2}
-              >
-                {periodosOptions.map((p) => (
-                  <option
-                    key={p.periodo}
-                    value={p.periodo}
-                    onClick={() => setSelectedPeriod(p)}
-                  >
-                    {p.periodo} (Materias: {p.materias.length})
-                  </option>
-                ))}
-              </Select>
-            )}
-            <Button
-              w="100%"
-              colorScheme="primary"
-              type="submit"
-              isDisabled={
-                periodosOptions.length > 0 ? !selectedPeriod : !siuData
-              }
+                } catch (e) {
+                  setError(e.message);
+                }
+              }}
             >
-              {periodosOptions.length > 0 ? "Aplicar" : "Cargar"} horarios
+              Cargar horarios
             </Button>
-            {error && (
-              <Text size="sm" color="tomato">
-                {error}
-              </Text>
-            )}
-          </form>
+          )}
+          {error && (
+            <Text size="sm" color="tomato">
+              {error}
+            </Text>
+          )}
           <Text fontSize="sm" mt={2}>
             (Este feature es nuevo y experimental, si no funciona como esperás
             hacemelo saber!)