diff --git a/TYPO3.Neos/Resources/Public/JavaScript/InlineEditing/Editors/Aloha/LinkPlugin/lib/neos-link-plugin.js b/TYPO3.Neos/Resources/Public/JavaScript/InlineEditing/Editors/Aloha/LinkPlugin/lib/neos-link-plugin.js
index 19b31145098..a7e8b021b36 100644
--- a/TYPO3.Neos/Resources/Public/JavaScript/InlineEditing/Editors/Aloha/LinkPlugin/lib/neos-link-plugin.js
+++ b/TYPO3.Neos/Resources/Public/JavaScript/InlineEditing/Editors/Aloha/LinkPlugin/lib/neos-link-plugin.js
@@ -55,15 +55,7 @@ define([
 				require({context: 'neos'}, ['Shared/Utility'], function(Utility) {
 					if (!Utility.isValidLink(value)) {
 						var url = 'http://' + value;
-						$(that.hrefField.getTargetObject()).attr('href', url);
-						if (that.target) {
-							that.hrefField.setAttribute(
-								'target',
-								that.target,
-								that.targetregex,
-								url
-							);
-						}
+						that.hrefField.setAttribute('href', url);
 					}
 				});
 			}
diff --git a/TYPO3.Neos/Resources/Public/Library/aloha/aloha.js b/TYPO3.Neos/Resources/Public/Library/aloha/aloha.js
index 148a89e0a6e..d1c41a1d5b5 100644
--- a/TYPO3.Neos/Resources/Public/Library/aloha/aloha.js
+++ b/TYPO3.Neos/Resources/Public/Library/aloha/aloha.js
@@ -34987,7 +34987,7 @@ define('ui/port-helper-attribute-field',[
 				// store the value to be the "reference" value for the currently selected resource item
 				resourceValue = v;
 				setAttribute(targetAttribute, item[valueField]);
-				RepositoryManager.markObject(targetObject, item);
+				executeForTargets(function (target) { RepositoryManager.markObject(target, item); });
 			} else {
 				resourceValue = null;
 			}
diff --git a/TYPO3.Neos/Scripts/Gruntfile.js b/TYPO3.Neos/Scripts/Gruntfile.js
index 3258f4b2924..1396c62255b 100644
--- a/TYPO3.Neos/Scripts/Gruntfile.js
+++ b/TYPO3.Neos/Scripts/Gruntfile.js
@@ -129,6 +129,9 @@ module.exports = function (grunt) {
 						src = src.replace(/var componentNameByElement = {\n/, "var componentNameByElement = { 'code': 'code'," + "\n");
 						src = src.replace("availableButtons: [ 'u',", "availableButtons: [ 'code', 'u',");
 
+						// fix https://github.com/alohaeditor/Aloha-Editor/issues/1525
+						src = src.replace('RepositoryManager.markObject(targetObject, item);', 'executeForTargets(function (target) { RepositoryManager.markObject(target, item); });');
+
 						return src;
 					}
 				}