diff --git a/src/common/components/front-components/radiobutton-shape.tsx b/src/common/components/front-components/radiobutton-shape.tsx
index 0862865e..2fd1d4b5 100644
--- a/src/common/components/front-components/radiobutton-shape.tsx
+++ b/src/common/components/front-components/radiobutton-shape.tsx
@@ -14,7 +14,7 @@ const radioButtonShapeRestrictions: ShapeSizeRestrictions = {
 };
 
 export const RadioButtonShape = forwardRef<any, ShapeProps>(
-  ({ x, y, width, height, id, onSelected, ...shapeProps }, ref) => {
+  ({ x, y, width, height, id, onSelected, text, ...shapeProps }, ref) => {
     const { width: restrictedWidth, height: restrictedHeight } =
       fitSizeToShapeSizeRestrictions(
         radioButtonShapeRestrictions,
@@ -62,7 +62,7 @@ export const RadioButtonShape = forwardRef<any, ShapeProps>(
         <Text
           x={radius * 2 + 10}
           y={radius * 0.5 + 5}
-          text="Select me!"
+          text={text}
           fontFamily="Comic Sans MS, cursive"
           fontSize={20}
           fill="none"
diff --git a/src/pods/canvas/canvas.model.ts b/src/pods/canvas/canvas.model.ts
index 4116a89b..f2965b61 100644
--- a/src/pods/canvas/canvas.model.ts
+++ b/src/pods/canvas/canvas.model.ts
@@ -131,6 +131,7 @@ const doesShapeAllowInlineEdition = (shapeType: ShapeType): boolean => {
     case 'button':
     case 'textarea':
     case 'accordion':
+    case 'radiobutton':
       return true;
     default:
       return false;
@@ -147,6 +148,8 @@ const generateDefaultTextValue = (shapeType: ShapeType): string | undefined => {
       return 'Select an option';
     case 'button':
       return 'Click Me!';
+    case 'radiobutton':
+      return 'Select me!';
     case 'textarea':
       return 'Your text here...';
     case 'accordion':
diff --git a/src/pods/canvas/shape-renderer/simple-component/radiobutton.renderer.tsx b/src/pods/canvas/shape-renderer/simple-component/radiobutton.renderer.tsx
index c85d32d3..b30966c8 100644
--- a/src/pods/canvas/shape-renderer/simple-component/radiobutton.renderer.tsx
+++ b/src/pods/canvas/shape-renderer/simple-component/radiobutton.renderer.tsx
@@ -24,6 +24,8 @@ export const renderRadioButton = (
       onDragEnd={handleDragEnd(shape.id)}
       onTransform={handleTransform}
       onTransformEnd={handleTransform}
+      isEditable={shape.allowsInlineEdition}
+      text={shape.text}
     />
   );
 };