diff --git a/src/main/java/ee/carlrobert/codegpt/actions/editor/OpenNewChatAction.java b/src/main/java/ee/carlrobert/codegpt/actions/editor/OpenNewChatAction.java
index 1a5c283d..dd4882e3 100644
--- a/src/main/java/ee/carlrobert/codegpt/actions/editor/OpenNewChatAction.java
+++ b/src/main/java/ee/carlrobert/codegpt/actions/editor/OpenNewChatAction.java
@@ -12,7 +12,6 @@ public class OpenNewChatAction extends AnAction {
 
   public OpenNewChatAction() {
     super(Icons.OpenNewTab);
-    EditorActionsUtil.registerAction(this);
   }
 
   @Override
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/actions/editor/AddSelectionToContextAction.kt b/src/main/kotlin/ee/carlrobert/codegpt/actions/editor/AddSelectionToContextAction.kt
index 0f807dae..2228060c 100644
--- a/src/main/kotlin/ee/carlrobert/codegpt/actions/editor/AddSelectionToContextAction.kt
+++ b/src/main/kotlin/ee/carlrobert/codegpt/actions/editor/AddSelectionToContextAction.kt
@@ -13,6 +13,12 @@ class AddSelectionToContextAction : BaseEditorAction(AllIcons.General.Add) {
         val chatTabPanel = chatToolWindowContentManager
             .tryFindActiveChatTabPanel()
             .orElseThrow()
+
+        val toolwindow = chatToolWindowContentManager.toolWindow
+        if (!toolwindow.isActive) {
+            toolwindow.show()
+        }
+
         chatTabPanel.addSelection(editor.virtualFile, editor.selectionModel)
     }
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 106f44ae..d91c3a8b 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -140,17 +140,10 @@
                   description="Creates a new chat session">
                     <keyboard-shortcut keymap="$default" first-keystroke="ctrl alt shift N" replace-all="true"/>
                 </action>
-                <action
-                  id="CodeGPT.AddSelectionToContext"
-                  class="ee.carlrobert.codegpt.actions.editor.AddSelectionToContextAction"
-                  text="Include Selection in Prompt"
-                  description="Adds the selected text to the CodeGPT context">
-                    <keyboard-shortcut keymap="$default" first-keystroke="ctrl shift I" replace-all="true"/>
-                </action>
                 <action
                   id="CodeGPT.ContextMenuEditCodeAction"
                   text="Edit Code"
-                  description="Edit code in natural language"
+                  description="Edit code from editor's context menu"
                   class="ee.carlrobert.codegpt.actions.editor.EditCodeContextMenuAction">
                     <keyboard-shortcut keymap="$default" first-keystroke="ctrl shift K" replace-all="true"/>
                 </action>
@@ -208,16 +201,10 @@
             <action
               id="CodeGPT.FloatingMenuEditCodeAction"
               text="Edit Code"
-              description="Edit code in natural language"
+              description="Edit code from editor's floating menu"
               class="ee.carlrobert.codegpt.actions.editor.EditCodeFloatingMenuAction">
                 <keyboard-shortcut keymap="$default" first-keystroke="ctrl shift K" replace-all="true"/>
             </action>
-            <action
-              id="CodeGPT.AddSelectionToContextAction"
-              text="Include Selection in Prompt"
-              class="ee.carlrobert.codegpt.actions.editor.AddSelectionToContextAction">
-                <keyboard-shortcut keymap="$default" first-keystroke="ctrl shift I" replace-all="true"/>
-            </action>
             <add-to-group
               group-id="Floating.CodeToolbar"
               relative-to-action="ProjectViewPopupMenuRefactoringGroup"
@@ -225,6 +212,17 @@
             <separator/>
         </group>
 
+        <action
+          id="CodeGPT.AddSelectionToContext"
+          class="ee.carlrobert.codegpt.actions.editor.AddSelectionToContextAction"
+          text="Include Selection in Prompt"
+          description="Adds the selected text to the CodeGPT context">
+            <keyboard-shortcut keymap="$default" first-keystroke="ctrl shift I" replace-all="true"/>
+
+            <add-to-group group-id="action.editor.group.EditorActionGroup" anchor="after" relative-to-action="CodeGPT.NewChat"/>
+            <add-to-group group-id="CodeGPT.FloatingCodeToolbarMenuRootGroup" anchor="after" relative-to-action="CodeGPT.FloatingMenuEditCodeAction"/>
+        </action>
+
         <action
           id="codegpt.openSettings"
           text="Open Settings"
@@ -299,13 +297,16 @@
             <add-to-group group-id="Vcs.MessageActionGroup" anchor="first"/>
             <action
                 id="CodeGPT.GenerateGitCommitMessage"
+                text="Generate Commit Message"
                 class="ee.carlrobert.codegpt.actions.GenerateCommitMessageAction"/>
             <action
                 id="CodeGPT.GenerateGitCommitMessageWithAdditionalInput"
+                text="Generate Commit Message with Additional Input"
                 class="ee.carlrobert.codegpt.actions.GenerateCommitMessageWithAdditionalInputAction"/>
             <separator/>
             <action
               id="CodeGPT.ReviewChanges"
+              text="Review Changes"
               class="ee.carlrobert.codegpt.actions.ReviewChangesAction"/>
         </group>
     </actions>