diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 3cbad10c5c9..354a7c1b83c 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -566,7 +566,8 @@
 /obj/structure/table/woodentable/attackby(obj/item/I as obj, mob/user as mob, params)
 
 	if (istype(I, /obj/item/stack/tile/grass))
-		qdel(I)
+		var/obj/item/stack/tile/grass/gr = I
+		gr.use(1)
 		new /obj/structure/table/woodentable/poker( src.loc )
 		qdel(src)
 		visible_message("<span class='notice'>[user] adds the grass to the wooden table</span>")
@@ -610,7 +611,7 @@
 		qdel(src)
 		return
 
-	if(!(I.flags & ABSTRACT))
+	if(!(I.flags & ABSTRACT) && !(istype(I, /obj/item/stack/tile/grass)))
 		if(user.drop_item())
 			I.Move(loc)
 			var/list/click_params = params2list(params)
@@ -621,6 +622,7 @@
 			I.pixel_x = Clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2)
 			I.pixel_y = Clamp(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2)
 
+
 	return 1
 
 /obj/structure/table/woodentable/poker //No specialties, Just a mapping object.