diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index a7aab148e5..7a3ebf52c7 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -659,7 +659,8 @@ void SCH_TEXT::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, MSG_PANEL_ITEMS& aList )
     default: return;
     }
 
-    aList.push_back( MSG_PANEL_ITEM( msg, GetShownText() ) );
+    // Don't use GetShownText() here; we want to show the user the variable references
+    aList.push_back( MSG_PANEL_ITEM( msg, UnescapeString( GetText() ) ) );
 
     switch( GetLabelSpinStyle() )
     {
diff --git a/pcbnew/fp_text.cpp b/pcbnew/fp_text.cpp
index 113fff8887..591cc1d054 100644
--- a/pcbnew/fp_text.cpp
+++ b/pcbnew/fp_text.cpp
@@ -31,6 +31,7 @@
 #include <footprint.h>
 #include <settings/settings_manager.h>
 #include <trigo.h>
+#include <kicad_string.h>
 
 FP_TEXT::FP_TEXT( FOOTPRINT* aParentFootprint, TEXT_TYPE text_type ) :
     BOARD_ITEM( aParentFootprint, PCB_FP_TEXT_T ),
@@ -282,7 +283,8 @@ void FP_TEXT::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITE
 
     aList.emplace_back( _( "Footprint" ), fp ? fp->GetReference() : _( "<invalid>" ) );
 
-    aList.emplace_back( _( "Text" ), GetShownText() );
+    // Don't use GetShownText() here; we want to show the user the variable references
+    aList.emplace_back( _( "Text" ), UnescapeString( GetText() ) );
 
     wxASSERT( m_Type >= TEXT_is_REFERENCE && m_Type <= TEXT_is_DIVERS );
     aList.emplace_back( _( "Type" ), text_type_msg[m_Type] );
diff --git a/pcbnew/pcb_text.cpp b/pcbnew/pcb_text.cpp
index fba0b82654..e27b8a87b4 100644
--- a/pcbnew/pcb_text.cpp
+++ b/pcbnew/pcb_text.cpp
@@ -32,6 +32,7 @@
 #include <pcb_text.h>
 #include <pcb_painter.h>
 #include <trigo.h>
+#include <kicad_string.h>
 
 using KIGFX::PCB_RENDER_SETTINGS;
 
@@ -108,7 +109,8 @@ void PCB_TEXT::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_IT
 {
     EDA_UNITS units = aFrame->GetUserUnits();
 
-    aList.emplace_back( _( "PCB Text" ), GetShownText() );
+    // Don't use GetShownText() here; we want to show the user the variable references
+    aList.emplace_back( _( "PCB Text" ), UnescapeString( GetText() ) );
 
     if( IsLocked() )
         aList.emplace_back( _( "Status" ), _( "locked" ) );