diff --git a/src/components/WishCounterAddModal.svelte b/src/components/WishCounterAddModal.svelte
index 2bbc6d5d..d7c50f46 100644
--- a/src/components/WishCounterAddModal.svelte
+++ b/src/components/WishCounterAddModal.svelte
@@ -85,11 +85,11 @@
     <CharacterSelect bind:selected={name} />
   {/if}
   <div class="h-4" />
-  <Input type="datetime-local" step="1" bind:value={time} />
+  <Input type="datetime-local" step="1" max="9999-12-31T23:59:59" bind:value={time} />
   <div class="h-4" />
   <div class="flex items-center">
     <p class="ml-4 mr-4">At Pity:</p>
-    <Input type="number" bind:value={pity} />
+    <Input type="number" min="1" bind:value={pity} />
   </div>
   {#if isEdit}
     <div class="flex mt-32">
diff --git a/src/routes/wish/_counter.svelte b/src/routes/wish/_counter.svelte
index a86ac4d3..012ba907 100644
--- a/src/routes/wish/_counter.svelte
+++ b/src/routes/wish/_counter.svelte
@@ -424,7 +424,7 @@
           <div class="bg-background rounded-xl w-full px-4 mr-2 flex items-center">
             <span>Click the list to edit or delete</span>
           </div>
-          <Button size="sm" className="w-16" on:click={() => openAddModal(0)}>Add</Button>
+          <Button size="sm" className="w-16" on:click={() => openAddModal(1)}>Add</Button>
         </div>
       {/if}
       <div class="flex">