diff --git a/src/netedit/frames/GNEAttributeTable.cpp b/src/netedit/frames/GNEAttributeTable.cpp
index 7d724010380..a22913f9e06 100644
--- a/src/netedit/frames/GNEAttributeTable.cpp
+++ b/src/netedit/frames/GNEAttributeTable.cpp
@@ -80,12 +80,14 @@ void
 GNEAttributeTable::showAttributeTableModule(const std::vector<GNEAttributeCarrier*> &ACs, bool includeExtended) {
     myEditedACs = ACs;
     if (ACs.size() > 0) {
+        // get tag property of first edited AC
+        const auto tagProperty = ACs.front()->getTagProperty();
         // Iterate over ACs and show row for every AC
-        for (int i = (int)myEditedACs.size(); i < MAX_ATTR; i++) {
-            myAttributeRows[i]->showAttributeRow(myEditedACs[i]);
+        for (int i = 0; i < tagProperty.getNumberOfAttributes(); i++) {
+            myAttributeRows[i]->showAttributeRow(tagProperty.getAttributeProperties(i), includeExtended);
         }
         // hide rest of rows before showing table
-        for (int i = (int)myEditedACs.size(); i < MAX_ATTR; i++) {
+        for (int i = tagProperty.getNumberOfAttributes(); i < MAX_ATTR; i++) {
             myAttributeRows[i]->hideAttributeRow();
         }
         show();