diff --git a/pcbnew/tools/pcb_selection_tool.cpp b/pcbnew/tools/pcb_selection_tool.cpp
index 08b17e9745..57d02e9209 100644
--- a/pcbnew/tools/pcb_selection_tool.cpp
+++ b/pcbnew/tools/pcb_selection_tool.cpp
@@ -2910,6 +2910,11 @@ bool PCB_SELECTION_TOOL::Selectable( const BOARD_ITEM* aItem, bool checkVisibili
         }
         else if( aItem->GetParentFootprint() )
         {
+            // Footprint text selections are only allowed in footprint editor mode.
+            // Careful, though: we also get here through the PCB_FIELD_T case.
+            if( aItem->Type() == PCB_TEXT_T && !checkVisibilityOnly )
+                return false;
+
             if( !view()->IsVisible( text ) )
                 return false;