diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java
index 861d8c1e..64c08593 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java
@@ -83,6 +83,10 @@ public class BoardSetupController extends Controller implements View.OnClickList
             int from = viewHolder.getAdapterPosition();
             int to = target.getAdapterPosition();
 
+            if (from == RecyclerView.NO_POSITION || to == RecyclerView.NO_POSITION) {
+                return false;
+            }
+
             presenter.move(from, to);
 
             return true;