diff --git a/src/_nftables b/src/_nftables
index c891ead..56f5a45 100644
--- a/src/_nftables
+++ b/src/_nftables
@@ -242,8 +242,12 @@ while true;do
     descriptors=(": : _nft_object $cmd_fam $cmd_tab $cmd_obj false")
     nextstate="start"
   ;;
+  (add-element | delete-element)
+    cmd_tab=$line[1]
+    descriptors=(": : _nft_object $cmd_fam $cmd_tab '\(map\|set\)' false")
+    nextstate="start"
+  ;;
   #TODO:
-  #(add-element | delete-element)
   #(add-set | add-map)
   #(add-flowtable)
   #("add-ct\ helper")