diff --git a/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java
index 1dca3cc1..4523b946 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java
@@ -449,8 +449,6 @@ public class ThreadManager implements Loader.LoaderListener {
             } else {
                 Utils.openLink(activity, (String) linkable.value);
             }
-        } else if (linkable.type == PostLinkable.Type.SPOILER) {
-            new AlertDialog.Builder(activity).setMessage((String) linkable.value).show();
         } else if (linkable.type == PostLinkable.Type.THREAD) {
             final PostLinkable.ThreadLink link = (PostLinkable.ThreadLink) linkable.value;
             final Loadable thread = new Loadable(link.board, link.threadId);
diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/PostLinkable.java b/Clover/app/src/main/java/org/floens/chan/core/model/PostLinkable.java
index 928681e3..c7c67812 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/model/PostLinkable.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/model/PostLinkable.java
@@ -36,6 +36,8 @@ public class PostLinkable extends ClickableSpan {
     public final Object value;
     public final Type type;
 
+    private boolean clicked = false;
+
     public PostLinkable(Post post, String key, Object value, Type type) {
         this.post = post;
         this.key = key;
@@ -48,6 +50,7 @@ public class PostLinkable extends ClickableSpan {
         if (post.getLinkableListener() != null) {
             post.getLinkableListener().onLinkableClick(this);
         }
+        clicked = true;
     }
 
     @Override
@@ -56,9 +59,11 @@ public class PostLinkable extends ClickableSpan {
             ds.setColor(type == Type.LINK ? ThemeHelper.getInstance().getLinkColor() : ThemeHelper.getInstance().getQuoteColor());
             ds.setUnderlineText(true);
         } else if (type == Type.SPOILER) {
-            ds.setColor(ThemeHelper.getInstance().getSpoilerColor());
-            ds.bgColor = ThemeHelper.getInstance().getSpoilerColor();
-            ds.setUnderlineText(false);
+            if (!clicked) {
+                ds.setColor(ThemeHelper.getInstance().getSpoilerColor());
+                ds.bgColor = ThemeHelper.getInstance().getSpoilerColor();
+                ds.setUnderlineText(false);
+            }
         }
     }
 
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java
index bfededd7..b876cfea 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java
@@ -21,7 +21,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.text.Layout;
-import android.text.Selection;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
@@ -476,14 +475,12 @@ public class PostView extends LinearLayout implements View.OnClickListener {
                 if (link.length != 0) {
                     if (action == MotionEvent.ACTION_UP) {
                         link[0].onClick(widget);
-                    } else if (action == MotionEvent.ACTION_DOWN) {
-                        Selection.setSelection(buffer, buffer.getSpanStart(link[0]), buffer.getSpanEnd(link[0]));
                     }
 
+                    commentView.invalidate();
+
                     return true;
                 } else {
-                    Selection.removeSelection(buffer);
-
                     // Changed this to propagate events
                     PostView.this.onTouchEvent(event);
                     return true;
@@ -492,8 +489,6 @@ public class PostView extends LinearLayout implements View.OnClickListener {
                 PostView.this.onTouchEvent(event);
                 return true;
             }
-
-            //            return Touch.onTouchEvent(widget, buffer, event);
         }
     }
 }