diff --git a/extensions/wikidata/module/scripts/dialogs/import-schema-dialog.js b/extensions/wikidata/module/scripts/dialogs/import-schema-dialog.js
index 1160e7a3f..9078829ba 100644
--- a/extensions/wikidata/module/scripts/dialogs/import-schema-dialog.js
+++ b/extensions/wikidata/module/scripts/dialogs/import-schema-dialog.js
@@ -8,7 +8,7 @@ ImportSchemaDialog.launch = function() {
   this._elmts.dialogHeader.text($.i18n('import-wikibase-schema/dialog-header'));
   this._elmts.fileLabel.html($.i18n('import-wikibase-schema/file-label'));
   this._elmts.schemaLabel.text($.i18n('import-wikibase-schema/schema-label'));
-  this._elmts.cancelButton.text($.i18n('core-project/cancel'));
+  this._elmts.cancelButton.text($.i18n('core-buttons/cancel'));
   this._elmts.importButton.text($.i18n('import-wikibase-schema/import'));
 
   this._level = DialogSystem.showDialog(frame);
@@ -58,7 +58,9 @@ ImportSchemaDialog.launch = function() {
         {   
         onDone: function() {
             theProject.overlayModels.wikibaseSchema = schema;
-            SchemaAlignment._discardChanges();
+            if (SchemaAlignment._isSetUp) {
+            	SchemaAlignment._discardChanges();
+            }
             dismiss();
         },
         onError: function(e) {
diff --git a/extensions/wikidata/module/scripts/schema-alignment.js b/extensions/wikidata/module/scripts/schema-alignment.js
index d03f428fd..a6faeb9b6 100644
--- a/extensions/wikidata/module/scripts/schema-alignment.js
+++ b/extensions/wikidata/module/scripts/schema-alignment.js
@@ -1388,4 +1388,3 @@ SchemaAlignment._updateWarnings = function(warnings, totalCount) {
         countsElem.show();
    }
 };
-