diff --git a/app/controllers/measurements_controller.rb b/app/controllers/measurements_controller.rb
index 06e8575..4f83655 100644
--- a/app/controllers/measurements_controller.rb
+++ b/app/controllers/measurements_controller.rb
@@ -22,12 +22,7 @@ class MeasurementsController < ApplicationController
     @measurement = @project.measurements.new(measurement_params)
     if @measurement.save
       flash[:notice] = 'Created new measurement'
-      if session[:m_filters][:scope].empty?
-        prepare_measurements
-      else
-        prepare_readouts
-        render :create_readouts
-      end
+      readouts_view? ? prepare_readouts : prepare_measurements
     else
       @measurement.readouts.new if @measurement.readouts.empty?
       render :new
@@ -40,13 +35,8 @@ class MeasurementsController < ApplicationController
   def update
     if @measurement.update(measurement_params)
       flash[:notice] = 'Updated measurement'
-      if session[:m_filters][:scope].empty?
-        prepare_measurements
-        render :index
-      else
-        prepare_readouts
-        render :readouts
-      end
+      readouts_view? ? prepare_readouts : prepare_measurements
+      render :index
     else
       render :edit
     end
@@ -75,7 +65,7 @@ class MeasurementsController < ApplicationController
   def toggle_column
     @measurement.column_view.toggle_column!(@quantity)
     prepare_readouts
-    render :readouts
+    render :index
   end
 
   private
@@ -120,4 +110,8 @@ class MeasurementsController < ApplicationController
       .includes(:source)
       .filter(session[:m_filters], @quantities)
   end
+
+  def readouts_view?
+    session[:m_filters][:scope].present?
+  end
 end
diff --git a/app/views/measurements/create.js.erb b/app/views/measurements/create.js.erb
index a931874..23d5a7d 100644
--- a/app/views/measurements/create.js.erb
+++ b/app/views/measurements/create.js.erb
@@ -1,4 +1,8 @@
 $('div[id^=flash_]').remove();
 $('#content').prepend('<%= j render_flash_messages %>');
 $('#new-measurement').empty();
-$('#measurements').html('<%= j render partial: 'measurements/index' %>');
+<% if defined? @quantities %>
+  $('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
+<% else %>
+  $('#measurements').html('<%= j render partial: 'measurements/index' %>');
+<% end %>
diff --git a/app/views/measurements/create_readouts.js.erb b/app/views/measurements/create_readouts.js.erb
deleted file mode 100644
index 1ed5667..0000000
--- a/app/views/measurements/create_readouts.js.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-$('div[id^=flash_]').remove();
-$('#content').prepend('<%= j render_flash_messages %>');
-$('#new-measurement').empty();
-$('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
diff --git a/app/views/measurements/index.js.erb b/app/views/measurements/index.js.erb
index 35c5b94..50e6b7f 100644
--- a/app/views/measurements/index.js.erb
+++ b/app/views/measurements/index.js.erb
@@ -1,3 +1,7 @@
 $('div[id^=flash_]').remove();
 $('#content').prepend('<%= j render_flash_messages %>');
-$('#measurements').html('<%= j render partial: 'measurements/index' %>');
+<% if defined? @quantities %>
+  $('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
+<% else %>
+  $('#measurements').html('<%= j render partial: 'measurements/index' %>');
+<% end %>
diff --git a/app/views/measurements/readouts.js.erb b/app/views/measurements/readouts.js.erb
deleted file mode 100644
index 8a2cc7f..0000000
--- a/app/views/measurements/readouts.js.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-$('div[id^=flash_]').remove();
-$('#content').prepend('<%= j render_flash_messages %>');
-$('#readouts').html('<%= j render partial: 'measurements/readouts' %>');