diff --git a/CHANGES.md b/CHANGES.md
index be546a1f36..1aa0c8d7ca 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@ Changes in RiotX 0.20.0 (2020-XX-XX)
 ===================================================
 
 Features ✨:
- - Add Direct Shortcuts
+ - Add Direct Shortcuts (#652)
 
 Improvements 🙌:
  -
diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
index 839763ffc0..b6e3cbcd76 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt
@@ -146,7 +146,8 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable {
             promptCompleteSecurityIfNeeded()
         }
 
-        shortcutsHandler.observeRoomsAndBuildShortcuts(context = this)
+        shortcutsHandler.observeRoomsAndBuildShortcuts()
+                .disposeOnDestroy()
     }
 
     private fun promptCompleteSecurityIfNeeded() {
diff --git a/vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt b/vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt
index 1211389a12..657942457e 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt
@@ -16,7 +16,6 @@
 
 package im.vector.riotx.features.home
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Bitmap
 import android.os.Build
@@ -28,6 +27,7 @@ import im.vector.matrix.android.api.util.toMatrixItem
 import im.vector.riotx.core.glide.GlideApp
 import im.vector.riotx.core.utils.DimensionConverter
 import im.vector.riotx.features.home.room.detail.RoomDetailActivity
+import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import javax.inject.Inject
 
@@ -36,15 +36,25 @@ private const val adaptiveIconSizeDp = 108
 private const val adaptiveIconOuterSidesDp = 18
 
 class ShortcutsHandler @Inject constructor(
+        private val context: Context,
         private val homeRoomListStore: HomeRoomListDataSource,
         private val avatarRenderer: AvatarRenderer,
         private val dimensionConverter: DimensionConverter
 ) {
+    private val adaptiveIconSize = dimensionConverter.dpToPx(adaptiveIconSizeDp)
+    private val adaptiveIconOuterSides = dimensionConverter.dpToPx(adaptiveIconOuterSidesDp)
+    private val iconSize by lazy {
+        if (useAdaptiveIcon) {
+            adaptiveIconSize - adaptiveIconOuterSides
+        } else {
+            dimensionConverter.dpToPx(72)
+        }
+    }
 
-    @SuppressLint("CheckResult")
-    fun observeRoomsAndBuildShortcuts(context: Context) {
-        homeRoomListStore
+    fun observeRoomsAndBuildShortcuts(): Disposable {
+        return homeRoomListStore
                 .observe()
+                .distinct()
                 .observeOn(Schedulers.computation())
                 .subscribe { rooms ->
                     val shortcuts = rooms
@@ -52,16 +62,7 @@ class ShortcutsHandler @Inject constructor(
                             .take(n = 4) // Android only allows us to create 4 shortcuts
                             .map { room ->
                                 val intent = RoomDetailActivity.shortcutIntent(context, room.roomId)
-
-                                val adaptiveIconSize = dimensionConverter.dpToPx(adaptiveIconSizeDp)
-                                val adaptiveIconOuterSides = dimensionConverter.dpToPx(adaptiveIconOuterSidesDp)
-                                val size = if (useAdaptiveIcon) {
-                                    adaptiveIconSize - adaptiveIconOuterSides
-                                } else {
-                                    dimensionConverter.dpToPx(72)
-                                }
-
-                                val bitmap = avatarRenderer.shortcutDrawable(context, GlideApp.with(context), room.toMatrixItem(), size)
+                                val bitmap = avatarRenderer.shortcutDrawable(context, GlideApp.with(context), room.toMatrixItem(), iconSize)
 
                                 ShortcutInfoCompat.Builder(context, room.roomId)
                                         .setShortLabel(room.displayName)