diff --git a/src/components/Editor/AddTalkModal.vue b/src/components/Editor/AddTalkModal.vue
new file mode 100644
index 000000000..339f6a627
--- /dev/null
+++ b/src/components/Editor/AddTalkModal.vue
@@ -0,0 +1,113 @@
+<template>
+	<NcModal size="normal"
+		class="modal"
+		:name="t('calendar', 'Select a Talk Room')"
+		@open="fetchTalkConversations">
+		<div class="modal-content">
+			<h2>{{ t('calendar', 'Select a talk room from the list') }}</h2>
+			<ul>
+				<li v-for="conversation in talkConversations" :key="conversation.id">
+					<NcButton @click="selectConversation(conversation)">
+						{{ t('calendar', 'Select') }}
+					</NcButton>
+				</li>
+			</ul>
+			<h2>{{ t('calendar', 'Create a new talk room') }}</h2>
+			<NcButton @click="createTalkRoom">
+				{{ t('calendar', 'Create a new talk room') }}
+			</NcButton>
+		</div>
+	</NcModal>
+</template>
+
+<script>
+import {
+	NcButton,
+	NcModal,
+} from '@nextcloud/vue'
+import axios from '@nextcloud/axios'
+import { createTalkRoom } from '../../services/talkService.js'
+import { showError, showSuccess } from '@nextcloud/dialogs'
+import { generateOcsUrl } from '@nextcloud/router'
+
+export default {
+	name: 'AddTalkModal',
+	components: {
+		NcButton,
+		NcModal,
+	},
+	props: {
+		calendarObjectInstance: {
+			type: Object,
+			required: true,
+		},
+	},
+	data() {
+		return {
+			talkConversations: [],
+			selectedConversation: null,
+			creatingTalkRoom: false,
+		}
+	},
+	methods: {
+		async fetchTalkConversations() {
+			try {
+				const response = await axios.get(generateOcsUrl('apps/spreed/api/v1/room'))
+				this.talkConversations = response.data.ocs.data.filter(conversation =>
+					conversation.joinable || conversation.is_moderator,
+				)
+			} catch (error) {
+				console.error('Error fetching Talk conversations:', error)
+			}
+		},
+		selectConversation(conversation) {
+			this.selectedConversation = conversation
+			this.applyConversationToEvent(conversation)
+			this.closeModal()
+		},
+		applyConversationToEvent(conversation) {
+			console.debug('Applying conversation to event:', conversation)
+			this.$emit('update-event', { talkRoom: conversation })
+		},
+		async createTalkRoom() {
+			const NEW_LINE = '\r\n'
+			try {
+				this.creatingTalkRoom = true
+				const url = await createTalkRoom(
+					this.calendarObjectInstance.title,
+					this.calendarObjectInstance.description,
+				)
+
+				// Store in LOCATION property if it's missing/empty. Append to description otherwise.
+				if ((this.calendarObjectInstance.location ?? '').trim() === '') {
+					this.calendarObjectInstanceStore.changeLocation({
+						calendarObjectInstance: this.calendarObjectInstance,
+						location: url,
+					})
+					showSuccess(this.$t('calendar', 'Successfully appended link to talk room to location.'))
+				} else {
+					if (!this.calendarObjectInstance.description) {
+						this.calendarObjectInstanceStore.changeDescription({
+							calendarObjectInstance: this.calendarObjectInstance,
+							description: url,
+						})
+					} else {
+						this.calendarObjectInstanceStore.changeDescription({
+							calendarObjectInstance: this.calendarObjectInstance,
+							description: this.calendarObjectInstance.description + NEW_LINE + NEW_LINE + url + NEW_LINE,
+						})
+					}
+					showSuccess(this.$t('calendar', 'Successfully appended link to talk room to description.'))
+				}
+			} catch (error) {
+				showError(this.$t('calendar', 'Error creating Talk room'))
+			} finally {
+				this.creatingTalkRoom = false
+			}
+		},
+	},
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/EditSidebar.vue b/src/views/EditSidebar.vue
index 7e96b9ea7..02baa6b23 100644
--- a/src/views/EditSidebar.vue
+++ b/src/views/EditSidebar.vue
@@ -82,13 +82,22 @@
 				@update-end-time="updateEndTime"
 				@update-end-timezone="updateEndTimezone"
 				@toggle-all-day="toggleAllDay" />
-
-			<PropertyText class="property-location"
-				:is-read-only="isReadOnly"
-				:prop-model="rfcProps.location"
-				:value="location"
-				:linkify-links="true"
-				@update:value="updateLocation" />
+			<div class="location-container">
+				<PropertyText class="property-location"
+					:is-read-only="isReadOnly"
+					:prop-model="rfcProps.location"
+					:value="location"
+					:linkify-links="true"
+					@update:value="updateLocation" />
+				<AddTalkModal v-if="isModalOpen"
+					:conversations="talkConversations"
+					@close="closeModal" />
+				<NcButton :disabled="isCreateTalkRoomButtonDisabled"
+					class="add-talk-button"
+					@click="openModal">
+					{{ t('calendar','Add Talk') }}
+				</NcButton>
+			</div>
 			<PropertyText class="property-description"
 				:is-read-only="isReadOnly"
 				:prop-model="rfcProps.description"
@@ -314,10 +323,14 @@ import usePrincipalsStore from '../store/principals.js'
 import useSettingsStore from '../store/settings.js'
 import useCalendarObjectInstanceStore from '../store/calendarObjectInstance.js'
 import { mapStores, mapState } from 'pinia'
+import AddTalkModal from '../components/Editor/AddTalkModal.vue'
+import { createTalkRoom, doesContainTalkLink } from '../services/talkService.js'
+import { showError, showSuccess } from '@nextcloud/dialogs'
 
 export default {
 	name: 'EditSidebar',
 	components: {
+		AddTalkModal,
 		ResourceList,
 		PropertyColor,
 		PropertySelectMultiple,
@@ -361,6 +374,10 @@ export default {
 			showModalUsers: [],
 			sharedProgress: 0,
 			showPreloader: false,
+			isModalOpen: false,
+			talkConversations: [],
+			selectedConversation: null,
+
 		}
 	},
 	computed: {
@@ -406,6 +423,21 @@ export default {
 		currentUser() {
 			return this.principalsStore.getCurrentUserPrincipal || null
 		},
+		isCreateTalkRoomButtonDisabled() {
+			if (this.creatingTalkRoom) {
+				return true
+			}
+
+			if (doesContainTalkLink(this.calendarObjectInstance.location)) {
+				return true
+			}
+			return doesContainTalkLink(this.calendarObjectInstance.description)
+
+		},
+		isCreateTalkRoomButtonVisible() {
+			return this.talkEnabled
+		},
+
 	},
 	mounted() {
 		window.addEventListener('keydown', this.keyboardCloseEditor)
@@ -420,6 +452,55 @@ export default {
 		window.removeEventListener('keydown', this.keyboardDuplicateEvent)
 	},
 	methods: {
+		selectConversation(conversation) {
+			this.selectedConversation = conversation
+			this.applyConversationToEvent(conversation)
+			this.closeModal()
+		},
+		openModal() {
+			this.isModalOpen = true
+		},
+
+		closeModal() {
+			this.isModalOpen = false
+		},
+
+		async createTalkRoom() {
+			const NEW_LINE = '\r\n'
+			try {
+				this.creatingTalkRoom = true
+				const url = await createTalkRoom(
+					this.calendarObjectInstance.title,
+					this.calendarObjectInstance.description,
+				)
+
+				// Store in LOCATION property if it's missing/empty. Append to description otherwise.
+				if ((this.calendarObjectInstance.location ?? '').trim() === '') {
+					this.calendarObjectInstanceStore.changeLocation({
+						calendarObjectInstance: this.calendarObjectInstance,
+						location: url,
+					})
+					showSuccess(this.$t('calendar', 'Successfully appended link to talk room to location.'))
+				} else {
+					if (!this.calendarObjectInstance.description) {
+						this.calendarObjectInstanceStore.changeDescription({
+							calendarObjectInstance: this.calendarObjectInstance,
+							description: url,
+						})
+					} else {
+						this.calendarObjectInstanceStore.changeDescription({
+							calendarObjectInstance: this.calendarObjectInstance,
+							description: this.calendarObjectInstance.description + NEW_LINE + NEW_LINE + url + NEW_LINE,
+						})
+					}
+					showSuccess(this.$t('calendar', 'Successfully appended link to talk room to description.'))
+				}
+			} catch (error) {
+				showError(this.$t('calendar', 'Error creating Talk room'))
+			} finally {
+				this.creatingTalkRoom = false
+			}
+		},
 		/**
 		 * Update the start and end date of this event
 		 *
@@ -676,8 +757,18 @@ export default {
 	height: auto;
 	border-radius: var(--border-radius);
 }
+.location-container{
+	display: flex;
+	align-items: center;
+	gap: 4px;
+}
+.add-talk-button {
+	flex-shrink: 0;
+}
 .property-location {
 	margin-top: 10px;
+	margin-left: -43px;
+	flex-grow: 1;
 }
 .property-description {
 	margin-bottom: 10px;