diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp
index e343db491c..a7c8760225 100644
--- a/pcbnew/class_pad.cpp
+++ b/pcbnew/class_pad.cpp
@@ -1312,12 +1312,24 @@ void D_PAD::ViewGetLayers( int aLayers[], int& aCount ) const
     else if( IsOnLayer( F_Cu ) )
     {
         aLayers[aCount++] = LAYER_PAD_FR;
-        aLayers[aCount++] = LAYER_PAD_FR_NETNAMES;
+
+        // Is this a PTH pad that has only front copper?  If so, we need to also display the
+        // net name on the PTH netname layer so that it isn't blocked by the drill hole.
+        if( m_Attribute == PAD_ATTRIB_STANDARD )
+            aLayers[aCount++] = LAYER_PADS_NETNAMES;
+        else
+            aLayers[aCount++] = LAYER_PAD_FR_NETNAMES;
     }
     else if( IsOnLayer( B_Cu ) )
     {
         aLayers[aCount++] = LAYER_PAD_BK;
-        aLayers[aCount++] = LAYER_PAD_BK_NETNAMES;
+
+        // Is this a PTH pad that has only back copper?  If so, we need to also display the
+        // net name on the PTH netname layer so that it isn't blocked by the drill hole.
+        if( m_Attribute == PAD_ATTRIB_STANDARD )
+            aLayers[aCount++] = LAYER_PADS_NETNAMES;
+        else
+            aLayers[aCount++] = LAYER_PAD_BK_NETNAMES;
     }
 
     // Check non-copper layers. This list should include all the layers that the