diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
index cce80af5..533be287 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
@@ -67,7 +67,7 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
 
     public void showImages(List<PostImage> images, int position, Loadable loadable) {
         this.images = images;
-        selectedPosition = position;
+        selectedPosition = Math.max(0, Math.min(images.size() - 1, position));
         this.loadable = loadable;
 
         progress = new ArrayList<>(images.size());
diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
index 9c19650f..324bb420 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
@@ -430,7 +430,7 @@ public class ThreadPresenter implements ChanLoader.ChanLoaderCallback, PostAdapt
                 for (int j = 0; j < item.images.size(); j++) {
                     PostImage image = item.images.get(j);
                     images.add(image);
-                    if (image == postImage) {
+                    if (image.equalUrl(postImage)) {
                         index = images.size() - 1;
                     }
                 }