diff --git a/cli/src/main/java/dev/starfix/Starfix.java b/cli/src/main/java/dev/starfix/Starfix.java
index e9e6709..0c60cdf 100644
--- a/cli/src/main/java/dev/starfix/Starfix.java
+++ b/cli/src/main/java/dev/starfix/Starfix.java
@@ -192,6 +192,10 @@ public static void editConfig() throws Exception {
                     ide = isWindows() ?"idea64.exe":"idea";
                     System.out.println("\n--------Selected IDE:IntelliJ_IDEA--------");
                     break;
+                } else if (id == 4) {
+                    ide = isWindows() ?"emacsclientw.exe":"emacsclient";
+                    System.out.println("\n--------Selected IDE:EMACS Client--------");
+                    break;
                 } else
                     System.out.println("\n--------Invalid Input!! Try Again--------");
             }
@@ -272,6 +276,13 @@ public static void launch_editor(Path directory, String ide, String path, String
                 filePath = filePath.replace("#",":");
                 runCommand(directory.getParent(), ide,path,filePath);
             }
+            if(ide.equals("emacsclientw.exe")||ide.equals("emacsclient")){
+                //emacsclient +4 info.txt
+                String lineNumber  = "+"+filePath.substring(filePath.lastIndexOf("#")+1);
+                filePath = filePath.substring(0,filePath.lastIndexOf("#"));
+
+                runCommand(directory.getParent(), ide,lineNumber,filePath);
+            }
 
         }
         else{