diff --git a/app/controllers/quantities_controller.rb b/app/controllers/quantities_controller.rb
index 238a931..043d3fa 100644
--- a/app/controllers/quantities_controller.rb
+++ b/app/controllers/quantities_controller.rb
@@ -6,6 +6,7 @@ class QuantitiesController < ApplicationController
 
   def index
     @quantity = @project.quantities.new
+    @quantity.domain = Quantity.domains[session[:q_filters][:domain]]
     prepare_quantities
   end
 
diff --git a/app/models/quantity.rb b/app/models/quantity.rb
index 5f49750..7e6afe1 100644
--- a/app/models/quantity.rb
+++ b/app/models/quantity.rb
@@ -2,9 +2,9 @@ class Quantity < ActiveRecord::Base
   include BodyTracking::Formula
 
   enum domain: {
+    diet: 0,
     measurement: 1,
-    exercise: 2,
-    diet: 0
+    exercise: 2
   }
 
   acts_as_nested_set dependent: :destroy, scope: :project
diff --git a/app/views/quantities/_form.html.erb b/app/views/quantities/_form.html.erb
index 07d2c9e..f2351dc 100644
--- a/app/views/quantities/_form.html.erb
+++ b/app/views/quantities/_form.html.erb
@@ -23,7 +23,7 @@
     $('[id=parent_select_'+$('#quantity_domain option:selected').val()+'] select')
       .attr('name', 'quantity[parent_id]');
   }
-  $('#quantity-form').on('click', '#quantity_domain', domainChange);
+  $('#quantity-form').on('change', '#quantity_domain', domainChange);
 
   $(document).ready(function() {
     domainChange();