diff --git a/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js b/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js
index 7f73181c9..d872a2895 100644
--- a/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js
+++ b/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js
@@ -80,23 +80,22 @@ export default function EditGasFeeButton({ userAcknowledgedGasMissing }) {
         <InfoTooltip
           contentText={
             <div className="edit-gas-fee-button__tooltip">
-              <Typography
-                variant={TYPOGRAPHY.H7}
-                color={COLORS.TEXT_ALTERNATIVE}
-              >
-                {t('dappSuggestedTooltip', [transaction.origin])}
+              {transaction?.origin && (
+                <Typography
+                  variant={TYPOGRAPHY.H7}
+                  color={COLORS.TEXT_ALTERNATIVE}
+                >
+                  {t('dappSuggestedTooltip', [transaction.origin])}
+                </Typography>
+              )}
+              <Typography variant={TYPOGRAPHY.H7}>
+                <b>{t('maxBaseFee')}</b> {maxFeePerGas}
               </Typography>
               <Typography variant={TYPOGRAPHY.H7}>
-                <b>{t('maxBaseFee')}</b>
-                {maxFeePerGas}
+                <b>{t('maxPriorityFee')}</b> {maxPriorityFeePerGas}
               </Typography>
               <Typography variant={TYPOGRAPHY.H7}>
-                <b>{t('maxPriorityFee')}</b>
-                {maxPriorityFeePerGas}
-              </Typography>
-              <Typography variant={TYPOGRAPHY.H7}>
-                <b>{t('gasLimit')}</b>
-                {gasLimit}
+                <b>{t('gasLimit')}</b> {gasLimit}
               </Typography>
             </div>
           }
diff --git a/ui/components/app/edit-gas-fee-button/index.scss b/ui/components/app/edit-gas-fee-button/index.scss
index 52c7cbaf4..448eab674 100644
--- a/ui/components/app/edit-gas-fee-button/index.scss
+++ b/ui/components/app/edit-gas-fee-button/index.scss
@@ -47,3 +47,10 @@
     }
   }
 }
+
+
+// Overrides react-tippy
+
+.tippy-tooltip .tippy-tooltip-content .edit-gas-fee-button__tooltip {
+  min-width: 170px;
+}