diff --git a/packages/diva-app/src/component/Trade/Orders/BuyLimit.tsx b/packages/diva-app/src/component/Trade/Orders/BuyLimit.tsx
index 5f9c9dcbc..c8e319469 100644
--- a/packages/diva-app/src/component/Trade/Orders/BuyLimit.tsx
+++ b/packages/diva-app/src/component/Trade/Orders/BuyLimit.tsx
@@ -90,7 +90,7 @@ export default function BuyLimit(props: {
     const nbrOptions = parseFloat(value)
     if (!isNaN(nbrOptions)) {
       setNumberOfOptions(nbrOptions)
-      if (pricePerOption > 0 && nbrOptions > 0) {
+      if (pricePerOption > 0 && nbrOptions > 0.0) {
         const youPay = pricePerOption * nbrOptions
         setYouPay(youPay)
         setOrderBtnDisabled(false)
@@ -503,7 +503,9 @@ export default function BuyLimit(props: {
             {params.tokenType.toUpperCase() + ' '}
           </FormLabel>
           <FormInput
-            type="text"
+            type="number"
+            step="0.01"
+            min="0"
             onChange={(event) => handleNumberOfOptions(event.target.value)}
           />
         </FormDiv>
@@ -522,7 +524,9 @@ export default function BuyLimit(props: {
             {params.tokenType.toUpperCase() + ' '}
           </FormLabel>
           <FormInput
-            type="text"
+            type="number"
+            step="0.01"
+            min="0"
             onChange={(event) => handlePricePerOptions(event.target.value)}
           />
         </FormDiv>
diff --git a/packages/diva-app/src/component/Trade/Orders/BuyMarket.tsx b/packages/diva-app/src/component/Trade/Orders/BuyMarket.tsx
index 7c1337582..39c599d3e 100644
--- a/packages/diva-app/src/component/Trade/Orders/BuyMarket.tsx
+++ b/packages/diva-app/src/component/Trade/Orders/BuyMarket.tsx
@@ -558,7 +558,9 @@ export default function BuyMarket(props: {
             {params.tokenType.toUpperCase() + ' '}
           </FormLabel>
           <FormInput
-            type="text"
+            type="number"
+            step="0.01"
+            min="0"
             onChange={(event) => handleNumberOfOptions(event.target.value)}
           />
         </FormDiv>
diff --git a/packages/diva-app/src/component/Trade/Orders/SellLimit.tsx b/packages/diva-app/src/component/Trade/Orders/SellLimit.tsx
index efa7245c5..ce23f067c 100644
--- a/packages/diva-app/src/component/Trade/Orders/SellLimit.tsx
+++ b/packages/diva-app/src/component/Trade/Orders/SellLimit.tsx
@@ -510,7 +510,9 @@ export default function SellLimit(props: {
             {params.tokenType.toUpperCase() + ' '}
           </FormLabel>
           <FormInput
-            type="text"
+            type="number"
+            step="0.1"
+            min="0"
             onChange={(event) => handleNumberOfOptions(event.target.value)}
           />
         </FormDiv>
@@ -529,7 +531,9 @@ export default function SellLimit(props: {
             {params.tokenType.toUpperCase() + ' '}
           </FormLabel>
           <FormInput
-            type="text"
+            type="number"
+            step="0.1"
+            min="0"
             onChange={(event) => handlePricePerOptions(event.target.value)}
           />
         </FormDiv>
diff --git a/packages/diva-app/src/component/Trade/Orders/SellMarket.tsx b/packages/diva-app/src/component/Trade/Orders/SellMarket.tsx
index 9f030e78f..eaafdd7fd 100644
--- a/packages/diva-app/src/component/Trade/Orders/SellMarket.tsx
+++ b/packages/diva-app/src/component/Trade/Orders/SellMarket.tsx
@@ -537,7 +537,9 @@ export default function SellMarket(props: {
             {params.tokenType.toUpperCase() + ' '}
           </FormLabel>
           <FormInput
-            type="text"
+            type="number"
+            step="0.01"
+            min="0"
             onChange={(event) => handleNumberOfOptions(event.target.value)}
           />
         </FormDiv>