diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/components/TotalTokensPanel.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/components/TotalTokensPanel.java
index 44952d3f..a58a168c 100644
--- a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/components/TotalTokensPanel.java
+++ b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/components/TotalTokensPanel.java
@@ -15,7 +15,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import javax.swing.Box;
 import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
+import org.jetbrains.annotations.Nullable;
 
 public class TotalTokensPanel extends JPanel {
 
@@ -23,7 +23,10 @@ public class TotalTokensPanel extends JPanel {
   private final TokenDetails tokenDetails;
   private final JBLabel label;
 
-  public TotalTokensPanel(Conversation conversation, String userPrompt, String highlightedText) {
+  public TotalTokensPanel(
+      Conversation conversation,
+      String userPrompt,
+      @Nullable String highlightedText) {
     super(new FlowLayout(FlowLayout.LEADING, 0, 0));
     this.encodingManager = EncodingManager.getInstance();
     this.tokenDetails = createTokenDetails(conversation, userPrompt, highlightedText);
@@ -65,11 +68,13 @@ public class TotalTokensPanel extends JPanel {
   private TokenDetails createTokenDetails(
       Conversation conversation,
       String userPrompt,
-      String highlightedText) {
+      @Nullable String highlightedText) {
     var tokenDetails = new TokenDetails(encodingManager);
     tokenDetails.setConversationTokens(encodingManager.countConversationTokens(conversation));
     tokenDetails.setUserPromptTokens(encodingManager.countTokens(userPrompt));
-    tokenDetails.setHighlightedTokens(encodingManager.countTokens(highlightedText));
+    if (highlightedText != null) {
+      tokenDetails.setHighlightedTokens(encodingManager.countTokens(highlightedText));
+    }
     return tokenDetails;
   }
 
diff --git a/src/main/java/ee/carlrobert/codegpt/util/EditorUtils.java b/src/main/java/ee/carlrobert/codegpt/util/EditorUtils.java
index f3bfa1c4..caec1c2e 100644
--- a/src/main/java/ee/carlrobert/codegpt/util/EditorUtils.java
+++ b/src/main/java/ee/carlrobert/codegpt/util/EditorUtils.java
@@ -52,13 +52,12 @@ public final class EditorUtils {
     return editorManager != null ? editorManager.getSelectedTextEditor() : null;
   }
 
-  public static @NotNull String getSelectedEditorSelectedText(@NotNull Project project) {
+  public static @Nullable String getSelectedEditorSelectedText(@NotNull Project project) {
     var selectedEditor = EditorUtils.getSelectedEditor(project);
-    var selectedText = "";
     if (selectedEditor != null) {
-      selectedText = selectedEditor.getSelectionModel().getSelectedText();
+      return selectedEditor.getSelectionModel().getSelectedText();
     }
-    return selectedText == null ? "" : selectedText;
+    return null;
   }
 
   public static boolean isMainEditorTextSelected(@NotNull Project project) {
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index ce17b4f7..889141e7 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -43,7 +43,6 @@
                 icon="ee.carlrobert.codegpt.Icons.DefaultSmallIcon">
             </group>
             <add-to-group group-id="EditorPopupMenu1" anchor="first"/>
-            <add-to-group group-id="Vcs.MessageActionGroup" anchor="first"/>
             <separator/>
         </group>
     </actions>