diff --git a/eeschema/tools/sch_edit_tool.cpp b/eeschema/tools/sch_edit_tool.cpp
index 229476a8b9..5e78552944 100644
--- a/eeschema/tools/sch_edit_tool.cpp
+++ b/eeschema/tools/sch_edit_tool.cpp
@@ -1905,7 +1905,13 @@ int SCH_EDIT_TOOL::EditField( const TOOL_EVENT& aEvent )
          || ( aEvent.IsAction( &SCH_ACTIONS::editFootprint ) && field->GetId() != FIELD_T::FOOTPRINT ) )
         {
             item = field->GetParentSymbol();
+
             m_selectionTool->ClearSelection( true );
+
+            // If the field to edit is not a symbol field, we cannot edit the ref, value or footprint
+            if( item == nullptr )
+                return 0;
+
             m_selectionTool->AddItemToSel( item );
         }
     }