diff --git a/components/ILIAS/UI/src/Implementation/Component/Modal/RoundTrip.php b/components/ILIAS/UI/src/Implementation/Component/Modal/RoundTrip.php
index a6125e631c31..c6bdeacdf510 100755
--- a/components/ILIAS/UI/src/Implementation/Component/Modal/RoundTrip.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Modal/RoundTrip.php
@@ -267,7 +267,7 @@ public function withDedicatedName(string $dedicated_name): self
      */
     public function getPromptButtons(): array
     {
-        return $this->buttons;
+        return $this->action_buttons;
     }
 
     /**
@@ -275,6 +275,6 @@ public function getPromptButtons(): array
      */
     public function getPromptTitle(): string
     {
-        return $this->type;
+        return $this->title;
     }
 }
diff --git a/components/ILIAS/UI/src/Implementation/Component/Prompt/State/Renderer.php b/components/ILIAS/UI/src/Implementation/Component/Prompt/State/Renderer.php
index d7c22257d2b5..734ec54493f4 100644
--- a/components/ILIAS/UI/src/Implementation/Component/Prompt/State/Renderer.php
+++ b/components/ILIAS/UI/src/Implementation/Component/Prompt/State/Renderer.php
@@ -58,11 +58,19 @@ protected function renderState(State $component, RendererInterface $default_rend
             return $tpl->get();
         }
 
-        $tpl->setVariable('CONTENT', $default_renderer->render($content_component));
+        $content = $content_component;
+        if ($content_component instanceof \ILIAS\UI\Component\Modal\RoundTrip) {
+            $content = $content_component->getContent();
+        }
+
+        $tpl->setVariable('CONTENT', $default_renderer->render($content));
         $tpl->setVariable('TITLE', $component->getTitle());
 
         $buttons = $component->getButtons();
-        if ($content_component instanceof \ILIAS\UI\Component\Input\Container\Form\Form) {
+        if (
+            $content_component instanceof \ILIAS\UI\Component\Input\Container\Form\Form &&
+            !($content_component instanceof \ILIAS\UI\Component\Modal\RoundTrip)
+        ) {
             $submit_button = $this->getUIFactory()->button()->standard(
                 $content_component->getSubmitLabel() ?? $this->txt("save"),
                 $content_component->getSubmitSignal()