diff --git a/client/CPlayerInterface.cpp b/client/CPlayerInterface.cpp
index 7fa51a985..da5298ecc 100644
--- a/client/CPlayerInterface.cpp
+++ b/client/CPlayerInterface.cpp
@@ -279,6 +279,7 @@ void CPlayerInterface::heroMoved(const TryMoveHero & details)
 
 				}
 			}
+			adventureInt->heroList.update(ho);
 			return;	//teleport - no fancy moving animation
 					//TODO: smooth disappear / appear effect
 		}
@@ -300,6 +301,7 @@ void CPlayerInterface::heroMoved(const TryMoveHero & details)
 		ho->isStanding = true;
 		stillMoveHero.setn(STOP_MOVE);
 		GH.totalRedraw();
+		adventureInt->heroList.update(ho);
 		return;
 	}
 
diff --git a/client/UIFramework/CIntObjectClasses.cpp b/client/UIFramework/CIntObjectClasses.cpp
index 9a23cac19..9be300aa3 100644
--- a/client/UIFramework/CIntObjectClasses.cpp
+++ b/client/UIFramework/CIntObjectClasses.cpp
@@ -371,10 +371,12 @@ void CAdventureMapButton::init(const CFunctionList<void()> &Callback, const std:
 	callback = Callback;
 	hoverable = actOnDown = borderEnabled = soundDisabled = false;
 	borderColor.unused = 1; // represents a transparent color, used for HighlightableButton
-	assignedKeys.insert(key);
 	hoverTexts = Name;
 	helpBox=HelpBox;
 
+	if (key != SDLK_UNKNOWN)
+		assignedKeys.insert(key);
+
 	pos.x += x;
 	pos.y += y;