diff --git a/src/main/kotlin/ee/carlrobert/codegpt/predictions/CodeSuggestionDiffViewer.kt b/src/main/kotlin/ee/carlrobert/codegpt/predictions/CodeSuggestionDiffViewer.kt
index 5581f625..1b6a2e08 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/predictions/CodeSuggestionDiffViewer.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/predictions/CodeSuggestionDiffViewer.kt
@@ -201,7 +201,7 @@ class CodeSuggestionDiffViewer(
         val footerText = if (isManuallyOpened) {
             CodeGPTBundle.get("shared.escToCancel")
         } else {
-            "Trigger manually: ${getShortcutText(OpenPredictionAction.ID)} · ${CodeGPTBundle.get("shared.escToCancel")}"
+            "Trigger manually: ${getShortcutText(TriggerCustomPredictionAction.ID)} · ${CodeGPTBundle.get("shared.escToCancel")}"
         }
 
         myEditor.component.add(
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/predictions/TriggerCustomPredictionAction.kt b/src/main/kotlin/ee/carlrobert/codegpt/predictions/TriggerCustomPredictionAction.kt
index 39034a7a..67467b2d 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/predictions/TriggerCustomPredictionAction.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/predictions/TriggerCustomPredictionAction.kt
@@ -1,9 +1,6 @@
 package ee.carlrobert.codegpt.predictions
 
 import com.intellij.codeInsight.hint.HintManagerImpl
-import com.intellij.notification.NotificationType
-import com.intellij.openapi.actionSystem.AnAction
-import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.service
@@ -14,8 +11,6 @@ import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler
 import ee.carlrobert.codegpt.CodeGPTKeys
 import ee.carlrobert.codegpt.settings.GeneralSettings
 import ee.carlrobert.codegpt.settings.service.ServiceType
-import ee.carlrobert.codegpt.settings.service.codegpt.CodeGPTServiceSettings
-import ee.carlrobert.codegpt.ui.OverlayUtil
 
 class TriggerCustomPredictionAction : EditorAction(Handler()), HintManagerImpl.ActionToIgnore {
 
@@ -30,22 +25,6 @@ class TriggerCustomPredictionAction : EditorAction(Handler()), HintManagerImpl.A
                 return
             }
 
-            if (!service<CodeGPTServiceSettings>().state.nextEditsEnabled) {
-                val notification = OverlayUtil.getDefaultNotification(
-                    "Please enable multi-line edits before using this feature.",
-                    NotificationType.WARNING,
-                )
-                notification.addAction(object : AnAction("Enable Multi-Line Edits") {
-                    override fun actionPerformed(e: AnActionEvent) {
-                        service<CodeGPTServiceSettings>().state.nextEditsEnabled = true
-                        notification.hideBalloon()
-                    }
-                })
-                OverlayUtil.notify(notification)
-
-                return
-            }
-
             ApplicationManager.getApplication().executeOnPooledThread {
                 service<PredictionService>().displayInlineDiff(editor, true)
             }
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTServiceForm.kt b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTServiceForm.kt
index 08ab74aa..1dabc632 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTServiceForm.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/settings/service/codegpt/CodeGPTServiceForm.kt
@@ -33,7 +33,7 @@ class CodeGPTServiceForm {
         }
 
     private val enableNextEditsEnabledCheckBox = JBCheckBox(
-        "Enable multi-line edits",
+        "Enable next edits",
         service<CodeGPTServiceSettings>().state.nextEditsEnabled
     )
 
diff --git a/src/main/resources/messages/codegpt.properties b/src/main/resources/messages/codegpt.properties
index 1eb191ba..e15eac4d 100644
--- a/src/main/resources/messages/codegpt.properties
+++ b/src/main/resources/messages/codegpt.properties
@@ -25,12 +25,12 @@ action.statusbar.enableCompletions.MainMenu.text=Enable Completions
 action.statusbar.disableCompletions.text=Disable Completions
 action.statusbar.disableCompletions.description=Disable Code Completions
 action.statusbar.disableCompletions.MainMenu.text=Disable Completions
-action.statusbar.enableNextEdits.text=Enable Multi-Line Edits
-action.statusbar.enableNextEdits.description=Enable Multi-Line Edits
-action.statusbar.enableNextEdits.MainMenu.text=Enable Multi-Line Edits
-action.statusbar.disableNextEdits.text=Disable Multi-Line Edits
-action.statusbar.disableNextEdits.description=Disable Multi-Line Edits
-action.statusbar.disableNextEdits.MainMenu.text=Disable Multi-Line Edits
+action.statusbar.enableNextEdits.text=Enable Next Edits
+action.statusbar.enableNextEdits.description=Enable Next Edits
+action.statusbar.enableNextEdits.MainMenu.text=Enable Next Edits
+action.statusbar.disableNextEdits.text=Disable Next Edits
+action.statusbar.disableNextEdits.description=Disable Next Edits
+action.statusbar.disableNextEdits.MainMenu.text=Disable Next Edits
 action.compareWithOriginal.title=Compare with Original
 action.applyDirectly.title=Auto Apply
 action.explainGitCommit.title=Explain Commit with ProxyAI