diff --git a/ghost/admin/app/components/modal-product-price.hbs b/ghost/admin/app/components/modal-product-price.hbs
index 7ff0ec1c36..91e60cccab 100644
--- a/ghost/admin/app/components/modal-product-price.hbs
+++ b/ghost/admin/app/components/modal-product-price.hbs
@@ -9,7 +9,7 @@
 <div class="modal-body">
     <div class="gh-main-section-block">
         <div class="gh-main-section-content grey gh-product-priceform-block">
-            <GhFormGroup @errors={{this.price.errors}} @hasValidated={{this.price.hasValidated}} @property="name">
+            <GhFormGroup @errors={{this.errors}} @property="name">
                 <label for="name" class="fw6">Name</label>
                 <GhTextInput
                     @value={{readonly this.price.nickname}}
@@ -17,9 +17,9 @@
                     @name="name"
                     @id="name"
                     @class="gh-input" />
-                <GhErrorMessage @errors={{this.price.errors}} @property="name" />
+                <GhErrorMessage @errors={{this.errors}} @property="name" />
             </GhFormGroup>
-            <GhFormGroup @errors={{this.price.errors}} @hasValidated={{this.price.hasValidated}} @property="description">
+            <GhFormGroup @errors={{this.errors}} @property="description">
                 <label for="description" class="fw6">Description</label>
                 <GhTextInput
                     @value={{readonly this.price.description}}
@@ -27,20 +27,21 @@
                     @name="description"
                     @id="description"
                     @class="gh-input" />
-                <GhErrorMessage @errors={{this.price.errors}} @property="description" />
+                <GhErrorMessage @errors={{this.errors}} @property="description" />
             </GhFormGroup>
             <div class="gh-product-priceform-pricecurrency">
-                <GhFormGroup @errors={{this.price.errors}} @hasValidated={{this.price.hasValidated}} @property="price">
-                    <label for="price" class="fw6">Price</label>
+                <GhFormGroup @errors={{this.errors}} @property="amount">
+                    <label for="amount" class="fw6">Price</label>
                     <div class="flex items-center justify-center gh-labs-price-label">
                         <GhTextInput
+                            @id="amount"
                             @value={{this.price.amount}}
                             @type="number"
                             @disabled={{this.isExistingPrice}}
                             @input={{action "setAmount" value="target.value"}}
                         />
                     </div>
-                    <GhErrorMessage @errors={{this.price.errors}} @property="price" />
+                    <GhErrorMessage @errors={{this.errors}} @property="amount" />
                 </GhFormGroup>
                 <GhFormGroup @class="for-select">
                     <label class="fw6 f8"for="currency">Plan currency</label>
@@ -65,6 +66,7 @@
                     @triggerId="period-input"
                     @value={{this.price.interval}} @disabled={{this.isExistingPrice}}
                 />
+                <GhErrorMessage @errors={{this.errors}} @property="interval" />
             </GhFormGroup>
         </div>
     </div>
diff --git a/ghost/admin/app/components/modal-product-price.js b/ghost/admin/app/components/modal-product-price.js
index 0b4236cee5..4e853b2725 100644
--- a/ghost/admin/app/components/modal-product-price.js
+++ b/ghost/admin/app/components/modal-product-price.js
@@ -1,7 +1,8 @@
+import EmberObject, {action} from '@ember/object';
 import ModalBase from 'ghost-admin/components/modal-base';
 import classic from 'ember-classic-decorator';
-import {action} from '@ember/object';
 import {currencies} from 'ghost-admin/utils/currency';
+import {isEmpty} from '@ember/utils';
 import {task} from 'ember-concurrency-decorators';
 import {tracked} from '@glimmer/tracking';
 
@@ -12,6 +13,7 @@ export default class ModalProductPrice extends ModalBase {
     @tracked price;
     @tracked currencyVal;
     @tracked periodVal;
+    @tracked errors = EmberObject.create();
 
     init() {
         super.init(...arguments);
@@ -40,7 +42,7 @@ export default class ModalProductPrice extends ModalBase {
             {
                 groupName: '—',
                 options: this.get('currencies')
-            }  
+            }
         ];
         this.currencyVal = this.price.currency || 'usd';
         this.periodVal = this.price.interval || 'month';
@@ -80,22 +82,40 @@ export default class ModalProductPrice extends ModalBase {
 
     @task({drop: true})
     *savePrice() {
-        try {
-            const priceObj = {
-                ...this.price,
-                amount: (this.price.amount || 0) * 100
-            };
-            if (!priceObj.id) {
-                priceObj.active = 1;
-                priceObj.currency = priceObj.currency || 'usd';
-                priceObj.interval = priceObj.interval || 'month';
-                priceObj.type = 'recurring';
-            }
-            yield this.confirm(priceObj);
-        } catch (error) {
-            this.notifications.showAPIError(error, {key: 'price.save.failed'});
-        } finally {
-            this.send('closeModal');
+        this.validatePriceData();
+        if (!isEmpty(this.errors) && Object.keys(this.errors).length > 0) {
+            return;
+        }
+        const priceObj = {
+            ...this.price,
+            amount: (this.price.amount || 0) * 100
+        };
+        if (!priceObj.id) {
+            priceObj.active = 1;
+            priceObj.currency = priceObj.currency || 'usd';
+            priceObj.interval = priceObj.interval || 'month';
+            priceObj.type = 'recurring';
+        }
+        yield this.confirm(priceObj);
+        this.send('closeModal');
+    }
+
+    validatePriceData() {
+        this.errors = EmberObject.create();
+        if (!this.price.nickname) {
+            this.errors.set('name', [{
+                message: 'Please enter name'
+            }]);
+        }
+        if (isNaN(this.price.amount)) {
+            this.errors.set('amount', [{
+                message: 'Please enter amount'
+            }]);
+        }
+        if (!this.price.interval || !['month', 'year'].includes(this.price.interval)) {
+            this.errors.set('interval', [{
+                message: 'Please enter billing interval'
+            }]);
         }
     }
 
diff --git a/ghost/admin/app/controllers/settings/product.js b/ghost/admin/app/controllers/settings/product.js
index 2151e27257..ae6c58028f 100644
--- a/ghost/admin/app/controllers/settings/product.js
+++ b/ghost/admin/app/controllers/settings/product.js
@@ -168,7 +168,11 @@ export default class ProductController extends Controller {
             return;
         }
         yield this.settings.save();
-        return yield this.product.save();
+        const response = yield this.product.save();
+        if (this.showPriceModal) {
+            this.closePriceModal();
+        }
+        return response;
     }
 
     _validateSignupRedirect(url, type) {