diff --git a/Clover/src/org/floens/chan/ui/activity/BoardEditor.java b/Clover/src/org/floens/chan/ui/activity/BoardEditor.java
index 64d1b57e..be6926ed 100644
--- a/Clover/src/org/floens/chan/ui/activity/BoardEditor.java
+++ b/Clover/src/org/floens/chan/ui/activity/BoardEditor.java
@@ -97,9 +97,11 @@ public class BoardEditor extends Activity {
                     @Override
                     public void onDismiss(ListView listView, int[] reverseSortedPositions) {
                         for (int position : reverseSortedPositions) {
-                            Board b = adapter.getItem(position);
-                            adapter.remove(b);
-                            b.saved = false;
+                            if (position >= 0 && position < adapter.getCount()) {
+                                Board b = adapter.getItem(position);
+                                adapter.remove(b);
+                                b.saved = false;
+                            }
                         }
 
                         adapter.notifyDataSetChanged();