diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd19fd4..dca5cbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ### 1.5.9 (23/01/2017)
 
 - Bug fix for invalid access tokens. Requests new access token when invalid/expired and keeps user signed in
+- Update UX bug where app focuses wrong thumbnail when returning from player in Favorites, Search or My Library
 
 ### 1.5.8 (12/01/2017)
 
diff --git a/components/screens/Favorites/Favorites.brs b/components/screens/Favorites/Favorites.brs
index 2f0d9e6..ba0b15d 100644
--- a/components/screens/Favorites/Favorites.brs
+++ b/components/screens/Favorites/Favorites.brs
@@ -69,8 +69,13 @@ function onKeyEvent(key as String, press as Boolean) as Boolean
         else if key = "back"
             ' if Details opened
             if m.gridScreen.visible = false and m.detailsScreen.videoPlayerVisible = false then
+                itemFocused = m.top.itemFocused
+
                 m.detailsScreen.visible = false
                 m.gridScreen.setFocus(true)
+
+                m.gridScreen.jumpToRowItem = itemFocused
+
                 m.gridScreen.visible = true
                 m.top.isChildrensVisible = false
                 result = true
diff --git a/components/screens/MyLibrary/MyLibrary.brs b/components/screens/MyLibrary/MyLibrary.brs
index ddc4573..5d1043a 100644
--- a/components/screens/MyLibrary/MyLibrary.brs
+++ b/components/screens/MyLibrary/MyLibrary.brs
@@ -91,8 +91,13 @@ function onKeyEvent(key as String, press as Boolean) as Boolean
         else if key = "back"
             ' if Details opened
             if m.gridScreen.visible = false and m.detailsScreen.videoPlayerVisible = false then
+                itemFocused = m.top.itemFocused
+
                 m.detailsScreen.visible = false
                 m.gridScreen.setFocus(true)
+
+                m.gridScreen.jumpToRowItem = itemFocused
+
                 m.gridScreen.visible = true
                 m.top.isChildrensVisible = false
                 result = true
diff --git a/components/screens/Search/Search.brs b/components/screens/Search/Search.brs
index d55cc32..f561857 100644
--- a/components/screens/Search/Search.brs
+++ b/components/screens/Search/Search.brs
@@ -99,9 +99,13 @@ function onKeyEvent(key as String, press as Boolean) as Boolean
       if key = "back"
         ' if HomeScene.Details opened
         if m.gridScreen.visible = false and m.detailsScreen.videoPlayerVisible = false then
+            itemFocused = m.top.itemFocused
 
             m.detailsScreen.visible = false
             m.gridScreen.setFocus(true)
+
+            m.gridScreen.jumpToRowItem = itemFocused
+
             m.gridScreen.visible = true
             m.top.isChildrensVisible = false
             result = true