diff --git a/.changes/next-release/feature-08da6a67-91d3-443f-b306-c4af3f0e0191.json b/.changes/next-release/feature-08da6a67-91d3-443f-b306-c4af3f0e0191.json
new file mode 100644
index 00000000000..627830c9ab6
--- /dev/null
+++ b/.changes/next-release/feature-08da6a67-91d3-443f-b306-c4af3f0e0191.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Remove read-only mode on before diff of code changes generated by agent"
+}
\ No newline at end of file
diff --git a/.changes/next-release/feature-a0ded7ea-63cd-4ed0-8ab7-6cbf31623acc.json b/.changes/next-release/feature-a0ded7ea-63cd-4ed0-8ab7-6cbf31623acc.json
new file mode 100644
index 00000000000..0b8ba50cb01
--- /dev/null
+++ b/.changes/next-release/feature-a0ded7ea-63cd-4ed0-8ab7-6cbf31623acc.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Provide more frequent updates about code changes made by agent"
+}
\ No newline at end of file
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
index 4fa4381e319..84d2cd084c8 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
@@ -8,7 +8,6 @@ import com.intellij.diff.DiffContentFactory
 import com.intellij.diff.DiffManager
 import com.intellij.diff.contents.EmptyContent
 import com.intellij.diff.requests.SimpleDiffRequest
-import com.intellij.diff.util.DiffUserDataKeys
 import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.command.WriteCommandAction
@@ -225,7 +224,6 @@ class FeatureDevController(
                     }
 
                     val request = SimpleDiffRequest(message.filePath, leftDiffContent, rightDiffContent, null, null)
-                    request.putUserData(DiffUserDataKeys.FORCE_READ_ONLY, true)
 
                     DiffManager.getInstance().showDiff(project, request)
                 }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt
index 7801085fd5c..4cccba2252d 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt
@@ -140,8 +140,8 @@ private suspend fun CodeGenerationState.generateCode(
     messenger: MessagePublisher,
     token: CancellationTokenSource?,
 ): CodeGenerationResult {
-    val pollCount = 180
-    val requestDelay = 10000L
+    val pollCount = 360
+    val requestDelay = 5000L
 
     repeat(pollCount) {
         if (token?.token?.isCancellationRequested() == true) {
diff --git a/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationStateTest.kt b/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationStateTest.kt
index f52fd7c685c..e488d5e4731 100644
--- a/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationStateTest.kt
+++ b/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationStateTest.kt
@@ -163,7 +163,7 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
             assertThat(actual.interaction.content).isEqualTo("")
         }
 
-        verify(exactly = 180) { featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId) }
+        verify(exactly = 360) { featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId) }
         coVerify(exactly = 0) { featureDevService.exportTaskAssistArchiveResult(testConversationId) }
     }
 }