diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ad61254c..aea0df1fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Now when switching networks the extension does not restart
 - Cleanup decimal bugs in our gas inputs.
+- Fix bug where submit button was enabled for invalid gas inputs.
 
 ## 3.7.0 2017-5-23
 
diff --git a/ui/app/components/bn-as-decimal-input.js b/ui/app/components/bn-as-decimal-input.js
index de01f8b5f..1d292ca2a 100644
--- a/ui/app/components/bn-as-decimal-input.js
+++ b/ui/app/components/bn-as-decimal-input.js
@@ -67,7 +67,7 @@ BnAsDecimalInput.prototype.render = function () {
 
             const scaledNumber = this.upsize(value, scale, precision)
             const precisionBN = new BN(scaledNumber, 10)
-            onChange(precisionBN)
+            onChange(precisionBN, event.target.checkValidity())
           },
           onInvalid: (event) => {
             const msg = this.constructWarning()
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index eed0fd9ae..8e63f5c76 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -346,18 +346,24 @@ PendingTx.prototype.miniAccountPanelForRecipient = function () {
   }
 }
 
-PendingTx.prototype.gasPriceChanged = function (newBN) {
+PendingTx.prototype.gasPriceChanged = function (newBN, valid) {
   log.info(`Gas price changed to: ${newBN.toString(10)}`)
   const txMeta = this.gatherTxMeta()
   txMeta.txParams.gasPrice = '0x' + newBN.toString('hex')
-  this.setState({ txData: clone(txMeta) })
+  this.setState({
+    txData: clone(txMeta),
+    valid,
+  })
 }
 
-PendingTx.prototype.gasLimitChanged = function (newBN) {
+PendingTx.prototype.gasLimitChanged = function (newBN, valid) {
   log.info(`Gas limit changed to ${newBN.toString(10)}`)
   const txMeta = this.gatherTxMeta()
   txMeta.txParams.gas = '0x' + newBN.toString('hex')
-  this.setState({ txData: clone(txMeta) })
+  this.setState({
+    txData: clone(txMeta),
+    valid,
+  })
 }
 
 PendingTx.prototype.resetGasFields = function () {