diff --git a/src/nqrduck_measurement/controller.py b/src/nqrduck_measurement/controller.py
index 6e9ce10..3251bc8 100644
--- a/src/nqrduck_measurement/controller.py
+++ b/src/nqrduck_measurement/controller.py
@@ -32,3 +32,7 @@ class MeasurementController(ModuleController):
             self.module.model.displayed_measurement = value
             self.module.model.add_measurement(value)
             self.module.view.measurement_dialog.hide()
+
+        elif key == "measurement_error" and self.module.view.measurement_dialog.isVisible():
+            logger.debug("Received measurement error.")
+            self.module.view.measurement_dialog.hide()
diff --git a/src/nqrduck_measurement/view.py b/src/nqrduck_measurement/view.py
index 7b6281a..9f74cb2 100644
--- a/src/nqrduck_measurement/view.py
+++ b/src/nqrduck_measurement/view.py
@@ -64,6 +64,7 @@ class MeasurementView(ModuleView):
             
     def change_to_time_view(self):
         plotter = self._ui_form.plotter
+        self._ui_form.fftButton.setText("FFT")
         plotter.canvas.ax.clear()
         plotter.canvas.ax.set_xlabel("Time (µs)")
         plotter.canvas.ax.set_ylabel("Amplitude (a.u.)")
@@ -72,6 +73,7 @@ class MeasurementView(ModuleView):
 
     def change_to_fft_view(self):
         plotter = self._ui_form.plotter
+        self._ui_form.fftButton.setText("iFFT")
         plotter.canvas.ax.clear()
         plotter.canvas.ax.set_xlabel("Frequency (MHz)")
         plotter.canvas.ax.set_ylabel("Amplitude (a.u.)")