diff --git a/sdrbase/gui/glscopenggui.cpp b/sdrbase/gui/glscopenggui.cpp
index a798563b4..123d0ee51 100644
--- a/sdrbase/gui/glscopenggui.cpp
+++ b/sdrbase/gui/glscopenggui.cpp
@@ -531,7 +531,7 @@ void GLScopeNGGUI::on_traceLen_valueChanged(int value)
 void GLScopeNGGUI::on_trace_valueChanged(int value)
 {
     //ui->traceText->setText(tr("%1").arg(value)); TODO: restore when more than 2 traces are supported
-    ui->traceText->setText(value == 0 ? "X" : "Y");
+    ui->traceText->setText(value == 0 ? "X" : QString("Y%1").arg(ui->trace->value()));
 
     ScopeVisNG::TraceData traceData;
     m_scopeVis->getTraceData(traceData, value);
@@ -549,7 +549,7 @@ void GLScopeNGGUI::on_trace_valueChanged(int value)
 
 void GLScopeNGGUI::on_traceAdd_clicked(bool checked)
 {
-    if (ui->trace->maximum() < 1) // TODO: extend to more traces when 2 traces are fully stable
+    if (ui->trace->maximum() < 3) // TODO: extend to more traces when 2 traces are fully stable
     {
         if (ui->trace->value() == 0)
         {
@@ -858,7 +858,7 @@ void GLScopeNGGUI::on_freerun_toggled(bool checked)
 
 void GLScopeNGGUI::setTraceIndexDisplay()
 {
-    ui->traceText->setText(ui->trace->value() == 0 ? "X" : "Y");
+    ui->traceText->setText(ui->trace->value() == 0 ? "X" : QString("Y%1").arg(ui->trace->value()));
 }
 
 void GLScopeNGGUI::setTrigCountDisplay()
diff --git a/sdrbase/gui/glscopenggui.ui b/sdrbase/gui/glscopenggui.ui
index 743d471f2..45958640b 100644
--- a/sdrbase/gui/glscopenggui.ui
+++ b/sdrbase/gui/glscopenggui.ui
@@ -487,7 +487,7 @@ kS/s</string>
       <widget class="QLabel" name="traceText">
        <property name="minimumSize">
         <size>
-         <width>10</width>
+         <width>15</width>
          <height>0</height>
         </size>
        </property>
@@ -495,7 +495,7 @@ kS/s</string>
         <string>0</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
@@ -1130,7 +1130,7 @@ kS/s</string>
       <widget class="QLabel" name="trigText">
        <property name="minimumSize">
         <size>
-         <width>10</width>
+         <width>15</width>
          <height>0</height>
         </size>
        </property>
@@ -1138,7 +1138,7 @@ kS/s</string>
         <string>0</string>
        </property>
        <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>