diff --git a/.gitignore b/.gitignore
index 95242ce7..957c519f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,4 @@ __pycache__/
 node_modules
 package-lock.json
 lms/public/frontend
-lms/www/lms.html
-frappe-ui
\ No newline at end of file
+lms/www/lms.html
\ No newline at end of file
diff --git a/frappe-ui b/frappe-ui
deleted file mode 160000
index a349ab07..00000000
--- a/frappe-ui
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a349ab070a73a3d22ead6a33374c9fe44f6ecf57
diff --git a/frontend/src/components/Modals/Question.vue b/frontend/src/components/Modals/Question.vue
index 2a7966c1..29ec5031 100644
--- a/frontend/src/components/Modals/Question.vue
+++ b/frontend/src/components/Modals/Question.vue
@@ -2,7 +2,7 @@
 	<Dialog v-model="show" :options="dialogOptions">
 		<template #body-content>
 			<div class="space-y-4">
-				<div class="flex items-center text-xs text-gray-700 space-x-5">
+				<div v-if="!editMode" class="flex items-center text-xs text-gray-700 space-x-5">
 					<div class="flex items-center space-x-2">
 						<input
 							type="radio"
@@ -29,7 +29,7 @@
 						</label>
 					</div>
 				</div>
-				<div v-if="questionType == 'new'" class="space-y-2">
+				<div v-if="questionType == 'new' || editMode" class="space-y-2">
 					<div>
 						<label class="block text-xs text-gray-600 mb-1">
 							{{ __('Question') }}
@@ -100,7 +100,6 @@ import {
 	FormControl,
 	TextEditor,
 	createResource,
-	createDocumentResource,
 } from 'frappe-ui'
 import { computed, watch, reactive, ref } from 'vue'
 import Link from '@/components/Controls/Link.vue'
@@ -109,6 +108,8 @@ import { showToast } from '@/utils'
 const show = defineModel()
 const quiz = defineModel('quiz')
 const questionType = ref(null)
+const editMode = ref(false)
+
 const existingQuestion = reactive({
 	question: '',
 	marks: 0,
@@ -137,25 +138,39 @@ const props = defineProps({
 		type: String,
 		default: __('Add a new question'),
 	},
-	questionData: {
-		type: [Object, null],
+	questionName: {
+		type: [String, null],
 		required: true,
 	},
 })
 
-watch(show, () => {
-	let data = props.questionData
-	if (show.value && data) {
+const questionData = createResource({
+	url: 'frappe.client.get',
+	makeParams() {
+		return {
+			doctype: 'LMS Question',
+			name: props.questionName,
+		}
+	},
+	auto: false,
+	cache: ['question', props.questionName],
+	onSuccess(data) {
 		let counter = 1
+		editMode.value = true
 		Object.keys(data).forEach((key) => {
 			if (Object.hasOwn(question, key)) question[key] = data[key]
 		})
 		while (counter <= 4) {
-			question[`is_correct_${counter}`] = question[`is_correct_${counter}`]
+			question[`is_correct_${counter}`] = data[`is_correct_${counter}`]
 				? true
 				: false
+			counter++;
 		}
-	}
+	},
+});
+
+watch(show, () => {
+	if (show.value && props.questionName) questionData.fetch()
 })
 
 const questionRow = createResource({
@@ -187,7 +202,7 @@ const questionCreation = createResource({
 })
 
 const submitQuestion = (close) => {
-	if (questionData.data?.name) updateQuestion()
+	if (questionData.data?.name) updateQuestion(close)
 	else addQuestion(close)
 }
 
@@ -241,6 +256,38 @@ const addQuestionRow = (question, close) => {
 	)
 }
 
+const questionUpdate = createResource({
+	url: 'frappe.client.set_value',
+	auto: false,
+	makeParams(values) {
+		return {
+			doctype: 'LMS Question',
+			name: questionData.data?.name,
+			fieldname: {
+				...question,
+			},
+		}
+	}
+})
+
+const updateQuestion = (close) => {
+	questionUpdate.submit(
+		{},
+		{
+			onSuccess() {
+				show.value = false
+				showToast(__('Success'), __('Question updated successfully'), 'check')
+				quiz.value.reload()
+				close()
+			},
+			onError(err) {
+				showToast(__('Error'), __(err.message?.[0] || err), 'x')
+				close()
+			},
+		}
+	)
+}
+
 const dialogOptions = computed(() => {
 	return {
 		title: __(props.title),
diff --git a/frontend/src/pages/QuizCreation.vue b/frontend/src/pages/QuizCreation.vue
index 3c96bb5a..b71210cd 100644
--- a/frontend/src/pages/QuizCreation.vue
+++ b/frontend/src/pages/QuizCreation.vue
@@ -123,7 +123,7 @@
 	</div>
 	<Question
 		v-model="showQuestionModal"
-		:questionData="currentQuestion"
+		:questionName="currentQuestion"
 		v-model:quiz="quizDetails"
 		:title="
 			currentQuestion ? __('Edit the question') : __('Add a new question')
@@ -172,7 +172,6 @@ onMounted(() => {
 		router.push({ name: 'Courses' })
 	}
 	if (props.quizID !== 'new') {
-		console.log('here')
 		quizDetails.reload()
 	}
 	window.addEventListener('keydown', keyboardShortcut)
@@ -343,32 +342,9 @@ watch(
 	}
 )
 
-const questionData = createResource({
-	url: 'lms.lms.utils.get_question_details',
-	makeParams(values) {
-		return {
-			question: values.question,
-		}
-	},
-	auto: false,
-	cache: ['question', props.questionName],
-})
-
 const openQuestionModal = (question = null) => {
-	if (question) {
-		questionData.reload(
-			{ question },
-			{
-				onSuccess(data) {
-					currentQuestion.value = data
-					showQuestionModal.value = true
-				},
-			}
-		)
-	} else {
-		currentQuestion.value = null
-		showQuestionModal.value = true
-	}
+	currentQuestion.value = question
+	showQuestionModal.value = true
 }
 
 const breadcrumbs = computed(() => {
diff --git a/lms/lms/doctype/lms_question/lms_question.py b/lms/lms/doctype/lms_question/lms_question.py
index 0e6f87bd..ca4bf2a2 100644
--- a/lms/lms/doctype/lms_question/lms_question.py
+++ b/lms/lms/doctype/lms_question/lms_question.py
@@ -11,7 +11,6 @@ class LMSQuestion(Document):
 	def validate(self):
 		validate_correct_answers(self)
 
-
 def validate_correct_answers(question):
 	if question.type == "Choices":
 		validate_duplicate_options(question)