diff --git a/frontend-js/src/main/js/map/AbstractCustomMap.js b/frontend-js/src/main/js/map/AbstractCustomMap.js
index d7d23ed70cda25cc1fe7b34ca511101e27c7552f..6312bc1318fe3f725fbdf97c6c74a51f89874720 100644
--- a/frontend-js/src/main/js/map/AbstractCustomMap.js
+++ b/frontend-js/src/main/js/map/AbstractCustomMap.js
@@ -632,7 +632,7 @@ AbstractCustomMap.prototype._hideSelectedLayout = function(layoutId) {
  * @param aliasId
  *          identifier of the alias
  */
-AbstractCustomMap.prototype._openInfoWindowForAlias = function(aliasId, onready) {
+AbstractCustomMap.prototype._openInfoWindowForAlias = function(aliasId) {
   var self = this;
 
   var infoWindow = this.getAliasInfoWindowById(aliasId);
@@ -642,18 +642,11 @@ AbstractCustomMap.prototype._openInfoWindowForAlias = function(aliasId, onready)
     } else {
       logger.warn("Info window for alias: " + aliasId + " is already opened");
     }
-    if (typeof onready === "function") {
-      onready();
-    }
     return Promise.resolve();
   } else {
     return self.getModel().getAliasById(aliasId).then(function(alias) {
       self._aliasInfoWindow[aliasId] = new AliasInfoWindow(alias, self);
-      return self._aliasInfoWindow[aliasId].init().then(function(){
-        if (typeof onready === "function") {
-          onready();
-        }
-      });
+      return self._aliasInfoWindow[aliasId].init();
     });
   }
 };
diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index 61e54470da7b7f9cabfd354c7b97485fa21bbd38..3373cba5377ed7462c65ffcd5cc64948fa94c786 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -753,7 +753,7 @@ CustomMap.prototype.openInfoWindowForAlias = function(aliasId, modelId) {
   logger.debug("Opening info window for alias: " + aliasId + ", model: " + modelId);
   var model = this.getSubmodelById(modelId);
   return model.getModel().getAliasById(aliasId, true).then(function() {
-    model._openInfoWindowForAlias(aliasId);
+    return model._openInfoWindowForAlias(aliasId);
   });
 };