diff --git a/CHANGELOG.md b/CHANGELOG.md
index b52f22341..12fb89b74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Cancel and Continue buttons not immediately visible on small screens in the Start/Join Room dialog ([#2333])
+
 ## [v4.7.0] - 2025-07-21
 
 ### Added
@@ -522,6 +526,7 @@ You can find the changelog for older versions there [here](https://github.com/TH
 [#2265]: https://github.com/THM-Health/PILOS/issues/2265
 [#2279]: https://github.com/THM-Health/PILOS/pull/2279
 [#2282]: https://github.com/THM-Health/PILOS/pull/2282
+[#2333]: https://github.com/THM-Health/PILOS/pull/2333
 [unreleased]: https://github.com/THM-Health/PILOS/compare/v4.7.0...develop
 [v3.0.0]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.0
 [v3.0.1]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.1
diff --git a/resources/js/components/RoomJoinButton.vue b/resources/js/components/RoomJoinButton.vue
index 49d47499b..be32a7e47 100644
--- a/resources/js/components/RoomJoinButton.vue
+++ b/resources/js/components/RoomJoinButton.vue
@@ -41,7 +41,7 @@
     <Message v-if="showRunningMessage" class="mb-4" severity="warn">{{
       $t("app.errors.room_already_running")
     }}</Message>
-    <form ref="joinForm" @submit.prevent="getJoinUrl">
+    <form ref="joinForm" id="startJoinForm" @submit.prevent="getJoinUrl">
       <OverlayComponent :show="isLoadingAction || loadingError" :opacity="0">
         <template #overlay>
           <LoadingRetryButton
@@ -152,8 +152,9 @@
           </div>
         </div>
       </OverlayComponent>
-
-      <div class="flex justify-end gap-2">
+    </form>
+    <template #footer>
+      <div class="mt-3 flex shrink-0 justify-end gap-2">
         <Button
           :label="$t('app.cancel')"
           data-test="dialog-cancel-button"
@@ -168,9 +169,10 @@
           :disabled="isLoadingAction || loadingError"
           size="small"
           type="submit"
+          form="startJoinForm"
         />
       </div>
-    </form>
+    </template>
   </Dialog>
 </template>
 <script setup>