diff --git a/app/ui/components/editors/environment-editor.js b/app/ui/components/editors/environment-editor.js
index 27a9827abb..715586b45a 100644
--- a/app/ui/components/editors/environment-editor.js
+++ b/app/ui/components/editors/environment-editor.js
@@ -36,11 +36,12 @@ class EnvironmentEditor extends PureComponent {
       }
     }
 
+    this.props.didChange();
+
+    // Call this last in case component unmounted
     if (this.state.error !== error || this.state.warning !== warning) {
       this.setState({error, warning});
     }
-
-    this.props.didChange();
   }
 
   _setEditorRef (n) {
@@ -80,7 +81,6 @@ class EnvironmentEditor extends PureComponent {
           lineWrapping={lineWrapping}
           keyMap={editorKeyMap}
           onChange={this._handleChange}
-          debounceMillis={DEBOUNCE_MILLIS * 6}
           defaultValue={JSON.stringify(environment)}
           nunjucksPowerUserMode={nunjucksPowerUserMode}
           render={render}
diff --git a/app/ui/components/modals/workspace-environments-edit-modal.js b/app/ui/components/modals/workspace-environments-edit-modal.js
index 6426dd11f0..fda4bc578e 100644
--- a/app/ui/components/modals/workspace-environments-edit-modal.js
+++ b/app/ui/components/modals/workspace-environments-edit-modal.js
@@ -41,6 +41,7 @@ type State = {
 class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
   environmentEditorRef: EnvironmentEditor | null;
   colorChangeTimeout: any;
+  saveTimeout: any;
   modal: Modal;
 
   constructor (props: Props) {
@@ -189,13 +190,13 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
   }
 
   _didChange () {
-    const isValid = this.environmentEditorRef ? this.environmentEditorRef.isValid() : false;
+    this._saveChanges();
 
+    // Call this last in case component unmounted
+    const isValid = this.environmentEditorRef ? this.environmentEditorRef.isValid() : false;
     if (this.state.isValid !== isValid) {
       this.setState({isValid});
     }
-
-    this._saveChanges();
   }
 
   _getActiveEnvironment (): Environment | null {
@@ -247,7 +248,10 @@ class WorkspaceEnvironmentsEditModal extends React.PureComponent<Props, State> {
     const activeEnvironment = this._getActiveEnvironment();
 
     if (activeEnvironment) {
-      models.environment.update(activeEnvironment, {data});
+      clearTimeout(this.saveTimeout);
+      this.saveTimeout = setTimeout(() => {
+        models.environment.update(activeEnvironment, {data});
+      }, DEBOUNCE_MILLIS * 4);
     }
   }