diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
index 62a152485..b62153b0f 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
@@ -332,7 +332,12 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
                 }
             }
             REQUEST_ADD_GIF -> {
-
+                if (resultCode == Activity.RESULT_OK && data != null) {
+                    val intent = ThemedMediaPickerActivity.withThemed(this@ComposeActivity)
+                            .getMedia(data.data)
+                            .build()
+                    startActivityForResult(intent, REQUEST_PICK_MEDIA)
+                }
             }
         }
 
@@ -521,7 +526,7 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
             }
             R.id.add_gif -> {
                 val provider = gifShareProvider ?: return true
-                startActivityForResult(provider.createGifSelectorIntent(), REQUEST_SET_SCHEDULE)
+                startActivityForResult(provider.createGifSelectorIntent(), REQUEST_ADD_GIF)
             }
             else -> {
                 when (item.groupId) {
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserMediaTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserMediaTimelineFragment.kt
index 3007553d3..5f30879d6 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserMediaTimelineFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserMediaTimelineFragment.kt
@@ -12,6 +12,8 @@ import com.bumptech.glide.Glide
 import org.mariotaku.twidere.adapter.StaggeredGridParcelableStatusesAdapter
 import org.mariotaku.twidere.adapter.iface.ILoadMoreSupportAdapter
 import org.mariotaku.twidere.constant.IntentConstants.*
+import org.mariotaku.twidere.extensions.reachingEnd
+import org.mariotaku.twidere.extensions.reachingStart
 import org.mariotaku.twidere.loader.MediaTimelineLoader
 import org.mariotaku.twidere.loader.iface.IExtendedLoader
 import org.mariotaku.twidere.model.ParcelableStatus
@@ -36,26 +38,11 @@ class UserMediaTimelineFragment : AbsContentRecyclerViewFragment<StaggeredGridPa
             super.refreshing = value
         }
 
-
     override val reachingEnd: Boolean
-        get() {
-            val lm = layoutManager
-            var visiblePos = lm.findLastCompletelyVisibleItemPositions(null)
-            if (visiblePos.all { it == RecyclerView.NO_POSITION }) {
-                visiblePos = lm.findLastVisibleItemPositions(null)
-            }
-            return visiblePos.contains(lm.itemCount - 1)
-        }
+        get() = layoutManager.reachingEnd
 
     override val reachingStart: Boolean
-        get() {
-            val lm = layoutManager
-            var visiblePos = lm.findFirstCompletelyVisibleItemPositions(null)
-            if (visiblePos.all { it == RecyclerView.NO_POSITION }) {
-                visiblePos = lm.findFirstVisibleItemPositions(null)
-            }
-            return visiblePos.contains(0)
-        }
+        get() = layoutManager.reachingStart
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
diff --git a/twidere/src/main/res/values/strings.xml b/twidere/src/main/res/values/strings.xml
index d4a964cb2..95c5a4955 100644
--- a/twidere/src/main/res/values/strings.xml
+++ b/twidere/src/main/res/values/strings.xml
@@ -1288,4 +1288,5 @@
     <string name="users_blocked">Blocked these users.</string>
     <string name="users_lists_with_name"><xliff:g id="name">%s</xliff:g>\'s lists</string>
     <string name="users_statuses">User\'s tweets</string>
+    <string name="hint_search_gif">Search GIF</string>
 </resources>