diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/FloatRangePropertyInputView.axaml b/src/Artemis.UI/DefaultTypes/PropertyInput/FloatRangePropertyInputView.axaml
index 07d3faeab..ad358c205 100644
--- a/src/Artemis.UI/DefaultTypes/PropertyInput/FloatRangePropertyInputView.axaml
+++ b/src/Artemis.UI/DefaultTypes/PropertyInput/FloatRangePropertyInputView.axaml
@@ -13,8 +13,8 @@
                                      Value="{CompiledBinding Start}"
                                      Prefix="{CompiledBinding Prefix}"
                                      Suffix="{CompiledBinding Affix}"
-                                     Minimum="{CompiledBinding End}"
-                                     Maximum="{CompiledBinding Max}"
+                                     Minimum="{CompiledBinding Min}"
+                                     Maximum="{CompiledBinding End}"
                                      LargeChange="{Binding LayerProperty.PropertyDescription.InputStepSize}"
                                      SimpleNumberFormat="F3"
                                      VerticalAlignment="Center"
diff --git a/src/Artemis.UI/DefaultTypes/PropertyInput/IntRangePropertyInputView.axaml b/src/Artemis.UI/DefaultTypes/PropertyInput/IntRangePropertyInputView.axaml
index 512006830..96ded4c7c 100644
--- a/src/Artemis.UI/DefaultTypes/PropertyInput/IntRangePropertyInputView.axaml
+++ b/src/Artemis.UI/DefaultTypes/PropertyInput/IntRangePropertyInputView.axaml
@@ -13,8 +13,8 @@
                                      Value="{CompiledBinding Start}"
                                      Prefix="{CompiledBinding Prefix}"
                                      Suffix="{CompiledBinding Affix}"
-                                     Minimum="{CompiledBinding End}"
-                                     Maximum="{CompiledBinding Max}"
+                                     Minimum="{CompiledBinding Min}"
+                                     Maximum="{CompiledBinding End}"
                                      LargeChange="{Binding LayerProperty.PropertyDescription.InputStepSize}"
                                      SimpleNumberFormat="F3"
                                      VerticalAlignment="Center"