diff --git a/packages/neos-ui-editors/src/Editors/Image/index.js b/packages/neos-ui-editors/src/Editors/Image/index.js
index <HASH>..<HASH> 100644
--- a/packages/neos-ui-editors/src/Editors/Image/index.js
+++ b/packages/neos-ui-editors/src/Editors/Image/index.js
@@ -171,11 +171,17 @@ export default class ImageEditor extends Component {
     }
 
     handleMediaSelected = assetIdentifier => {
-        const {commit} = this.props;
+        const {commit, value} = this.props;
         const newAsset = {
             __identity: assetIdentifier
         };
 
+        // Same image selected as before?
+        if (value && value.__identity === assetIdentifier) {
+            this.handleCloseSecondaryScreen();
+            return;
+        }
+
         this.setState({
             image: null,
             isAssetLoading: true
BUGFIX: Same image cannot be selected twice (#<I>)