diff --git a/src/pspm_data_editor.m b/src/pspm_data_editor.m
index f7b9103b8..81b0f1776 100644
--- a/src/pspm_data_editor.m
+++ b/src/pspm_data_editor.m
@@ -279,6 +279,8 @@ function PlotData(hObject)
   action = 'replace';
   for i=1:numel(channel)
     AddPlot(hObject, channel(i), action);
+    % Update y-axis label based on selected channel
+    ylabel(handles.axData, [handles.data{channel(i)}.header.chantype, ' -- ', handles.data{channel(i)}.header.units]);
     action = 'add';
   end
   set(handles.axData, 'NextPlot', np);