diff --git a/code/model/DMSDocumentSet.php b/code/model/DMSDocumentSet.php
index 88e596e..ce6f1dc 100644
--- a/code/model/DMSDocumentSet.php
+++ b/code/model/DMSDocumentSet.php
@@ -29,6 +29,7 @@ class DMSDocumentSet extends DataObject
             // Flag indicating if a document was added directly to a set - in which case it is set - or added
             // via the query-builder.
             'ManuallyAdded' => 'Boolean(1)',
+            'DocumentSort' => 'Int'
         ),
     );
 
@@ -87,6 +88,8 @@ class DMSDocumentSet extends DataObject
                     'Title'
                 );
             } else {
+                $fields->removeByName('DocumentSetSort');
+
                 // Document listing
                 $gridFieldConfig = GridFieldConfig::create()
                     ->addComponents(
@@ -109,12 +112,7 @@ class DMSDocumentSet extends DataObject
                 $gridFieldConfig->addComponent($paginatorComponent);
 
                 if (class_exists('GridFieldSortableRows')) {
-                    $sortableComponent = new GridFieldSortableRows('DocumentSort');
-                    // setUsePagination method removed from newer version of SortableGridField.
-                    if (method_exists($sortableComponent, 'setUsePagination')) {
-                        $sortableComponent->setUsePagination(false)->setForceRedraw(true);
-                    }
-                    $gridFieldConfig->addComponent($sortableComponent);
+                    $gridFieldConfig->addComponent(new GridFieldSortableRows('DocumentSort'));
                 }
 
                 $field = $fields->fieldByName('Root.Main.PageID');
diff --git a/templates/Includes/DocumentSet.ss b/templates/Includes/DocumentSet.ss
index f3efd51..0c50215 100644
--- a/templates/Includes/DocumentSet.ss
+++ b/templates/Includes/DocumentSet.ss
@@ -4,7 +4,7 @@
             <h3>$Title</h3>
         <% end_if %>
 
-        <% loop $getDocuments %>
+        <% loop $getDocuments.Sort(DocumentSort) %>
             <% include Document %>
         <% end_loop %>
     </div>
diff --git a/tests/DMSDocumentSetTest.php b/tests/DMSDocumentSetTest.php
index cf46e32..69f3acb 100644
--- a/tests/DMSDocumentSetTest.php
+++ b/tests/DMSDocumentSetTest.php
@@ -173,6 +173,26 @@ class DMSDocumentSetTest extends SapphireTest
         $this->assertSame('unit-test', $field->Value());
     }
 
+    /**
+     * Ensure that if the module is available, the orderable rows GridField component is added
+     */
+    public function testDocumentsAreOrderable()
+    {
+        if (!class_exists('GridFieldSortableRows')) {
+            $this->markTestSkipped('Test requires undefinedoffset/sortablegridfield installed.');
+        }
+
+        $fields = $this->objFromFixture('DMSDocumentSet', 'ds1')->getCMSFields();
+
+        $gridField = $fields->fieldByName('Root.Main.Documents');
+        $this->assertInstanceOf('GridField', $gridField);
+
+        $this->assertInstanceOf(
+            'GridFieldSortableRows',
+            $gridField->getConfig()->getComponentByType('GridFieldSortableRows')
+        );
+    }
+
     /**
      * Test that extra documents are added after write
      */