diff --git a/javascript/GridFieldSortableRows.js b/javascript/GridFieldSortableRows.js
index 988fbba..ce6771b 100644
--- a/javascript/GridFieldSortableRows.js
+++ b/javascript/GridFieldSortableRows.js
@@ -67,7 +67,11 @@
 																				form.removeClass('loading');
 																			});
 												}
-											}).disableSelection();
+											});
+				
+				if(refCheckbox.hasClass('gridfield-sortablerows-noselection') || $(this).is(':checked')) {
+					gridField.find('tbody').disableSelection();
+				}
 			},
 			
 			onchange: function(e) {