diff --git a/src/Extension/ProductVariationsExtension.php b/src/Extension/ProductVariationsExtension.php
index 3a663b64..90061118 100644
--- a/src/Extension/ProductVariationsExtension.php
+++ b/src/Extension/ProductVariationsExtension.php
@@ -57,7 +57,7 @@ public function updateCMSFields(FieldList $fields)
                 GridFieldConfig_RecordEditor::create(100)
             )
         ]);
-        
+
         $variationsGridField->getConfig()->addComponent($sort = new GridFieldOrderableRows('Sort'));
 
         if ($this->owner->Variations()->exists()) {
@@ -210,7 +210,7 @@ public function possibleValuesForAttributeType($type)
                 '"SilverShop_Variation_AttributeValues"."SilverShop_VariationID" = "SilverShop_Variation"."ID"'
             )->where(
                 "TypeID = $type AND \"SilverShop_Variation\".\"ProductID\" = " . $this->owner->ID
-            )->sort('"SilverShop_Variation"."Sort" ASC');
+            );
 
         if (!Product::config()->allow_zero_price) {
             $list = $list->where('"SilverShop_Variation"."Price" > 0');
diff --git a/src/Forms/VariationForm.php b/src/Forms/VariationForm.php
index c3079aae..fa30fcdc 100644
--- a/src/Forms/VariationForm.php
+++ b/src/Forms/VariationForm.php
@@ -130,7 +130,7 @@ protected function getFormFields($controller = null)
                     '',
                     ['attribute' => $attribute->Label]
                 ),
-                $product->possibleValuesForAttributeType($attribute)
+                $product->possibleValuesForAttributeType($attribute)->sort('Sort', 'ASC')
             );
 
             if ($attributeDropdown) {