1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c
index f0e3f5442cc..b0c0f660717 100644
--- a/source/blender/editors/space_node/node_templates.c
+++ b/source/blender/editors/space_node/node_templates.c
@@ -826,11 +826,22 @@ static void ui_node_draw_input(
         case SOCK_INT:
         case SOCK_BOOLEAN:
         case SOCK_RGBA:
-        case SOCK_STRING:
           uiItemR(sub, &inputptr, "default_value", 0, "", ICON_NONE);
           uiItemDecoratorR(
               split_wrapper.decorate_column, &inputptr, "default_value", RNA_NO_INDEX);
           break;
+        case SOCK_STRING: {
+          const bNodeTree *node_tree = (const bNodeTree *)nodeptr.owner_id;
+          if (node_tree->type == NTREE_GEOMETRY) {
+            node_geometry_add_attribute_search_button(node_tree, node, &inputptr, row);
+          }
+          else {
+            uiItemR(sub, &inputptr, "default_value", 0, "", ICON_NONE);
+          }
+          uiItemDecoratorR(
+              split_wrapper.decorate_column, &inputptr, "default_value", RNA_NO_INDEX);
+          break;
+        }
         default:
           add_dummy_decorator = true;
       }