diff --git a/app/pdb/item-cmds.c b/app/pdb/item-cmds.c
index 1ca3505db6..bac87e621e 100644
--- a/app/pdb/item-cmds.c
+++ b/app/pdb/item-cmds.c
@@ -167,9 +167,8 @@ item_id_is_text_layer_invoker (GimpProcedure         *procedure,
     {
       GimpItem *item = gimp_item_get_by_id (gimp, item_id);
 
-      text_layer = (GIMP_IS_LAYER (item) &&
-                    ! gimp_item_is_removed (item) &&
-                    gimp_item_is_text_layer (item));
+      text_layer = (GIMP_IS_TEXT_LAYER (item) &&
+                    ! gimp_item_is_removed (item));
     }
 
   return_vals = gimp_procedure_get_return_values (procedure, success,
@@ -200,9 +199,8 @@ item_id_is_vector_layer_invoker (GimpProcedure         *procedure,
     {
       GimpItem *item = gimp_item_get_by_id (gimp, item_id);
 
-      vector_layer = (GIMP_IS_LAYER (item) &&
-                      ! gimp_item_is_removed (item) &&
-                      gimp_item_is_vector_layer (item));
+      vector_layer = (GIMP_IS_VECTOR_LAYER (item) &&
+                      ! gimp_item_is_removed (item));
     }
 
   return_vals = gimp_procedure_get_return_values (procedure, success,
@@ -264,9 +262,8 @@ item_id_is_link_layer_invoker (GimpProcedure         *procedure,
     {
       GimpItem *item = gimp_item_get_by_id (gimp, item_id);
 
-      text_layer = (GIMP_IS_LAYER (item) &&
-                    ! gimp_item_is_removed (item) &&
-                    gimp_item_is_link_layer (item));
+      text_layer = (GIMP_IS_LINK_LAYER (item) &&
+                    ! gimp_item_is_removed (item));
     }
 
   return_vals = gimp_procedure_get_return_values (procedure, success,
diff --git a/pdb/groups/item.pdb b/pdb/groups/item.pdb
index d9c6ce66bb..6b5fcf7f86 100644
--- a/pdb/groups/item.pdb
+++ b/pdb/groups/item.pdb
@@ -170,9 +170,8 @@ HELP
 {
   GimpItem *item = gimp_item_get_by_id (gimp, item_id);
 
-  text_layer = (GIMP_IS_LAYER (item) &&
-                ! gimp_item_is_removed (item) &&
-                gimp_item_is_text_layer (item));
+  text_layer = (GIMP_IS_TEXT_LAYER (item) &&
+                ! gimp_item_is_removed (item));
 }
 CODE
     );
@@ -206,9 +205,8 @@ HELP
 {
   GimpItem *item = gimp_item_get_by_id (gimp, item_id);
 
-  vector_layer = (GIMP_IS_LAYER (item) &&
-                  ! gimp_item_is_removed (item) &&
-                  gimp_item_is_vector_layer (item));
+  vector_layer = (GIMP_IS_VECTOR_LAYER (item) &&
+                  ! gimp_item_is_removed (item));
 }
 CODE
     );
@@ -276,9 +274,8 @@ HELP
 {
   GimpItem *item = gimp_item_get_by_id (gimp, item_id);
 
-  text_layer = (GIMP_IS_LAYER (item) &&
-                ! gimp_item_is_removed (item) &&
-                gimp_item_is_link_layer (item));
+  text_layer = (GIMP_IS_LINK_LAYER (item) &&
+                ! gimp_item_is_removed (item));
 }
 CODE
     );