diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9dca71..e99c0fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## [1.0.2](https://github.com/UndefinedOffset/SortableGridField/tree/1.0.2) (2018-06-07)
+[Full Changelog](https://github.com/UndefinedOffset/SortableGridField/compare/1.0.1...1.0.2)
+
 ## [1.0.1](https://github.com/UndefinedOffset/SortableGridField/tree/1.0.1) (2018-03-01)
 [Full Changelog](https://github.com/UndefinedOffset/SortableGridField/compare/1.0.0...1.0.1)
 
diff --git a/code/forms/GridFieldSortableRows.php b/code/forms/GridFieldSortableRows.php
index 82b5282..40db0fb 100644
--- a/code/forms/GridFieldSortableRows.php
+++ b/code/forms/GridFieldSortableRows.php
@@ -598,7 +598,7 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP
 			
 			$i = 1;
 			foreach ($items as $obj) {
-				if ($obj->ID == $targetItem->ID) {
+				if ($obj->ID == $targetItem->ID || $i >= count($sortPositions)) {
 					continue;
 				}