diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
index 9691a22e..66a43cca 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
@@ -37,7 +37,6 @@ import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.FrameLayout;
-import android.widget.ListView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -487,8 +486,12 @@ public class ChanActivity extends BaseActivity implements AdapterView.OnItemSele
                 if (threadFragment.hasLoader()) {
                     Loader loader = threadFragment.getLoader();
                     if (loader != null && loader.getLoadable().isThreadMode() && loader.getThread() != null) {
-                        ChanApplication.getWatchManager().addPin(loader.getLoadable(), loader.getThread().op);
-                        pinDrawer.openDrawer(pinDrawerView);
+                        Pin pin = ChanApplication.getWatchManager().findPinByLoadable(threadLoadable);
+                        if(pin != null) {
+                            ChanApplication.getWatchManager().removePin(pin);
+                        } else {
+                            ChanApplication.getWatchManager().addPin(loader.getLoadable(), loader.getThread().op);
+                        }
                         updateActionBarState();
                     }
                 }