diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
index f499274a9..cdd15fd3d 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -248,7 +248,7 @@ namespace Flow.Launcher.Plugin.Explorer
 
         private Result CreateOpenWithEditorResult(SearchResult record)
         {
-            string editorPath = "Notepad.exe"; // TODO add the ability to create a custom editor
+            string editorPath = Settings.EditorPath;
 
             var name = Context.API.GetTranslation("plugin_explorer_openwitheditor") 
                                     + " " + Path.GetFileNameWithoutExtension(editorPath);
@@ -265,7 +265,7 @@ namespace Flow.Launcher.Plugin.Explorer
                     }
                     catch (Exception e)
                     {
-                        var message = $"Failed to open editor for file at {record.FullPath}";
+                        var message = $"Failed to open editor for file at {record.FullPath} with Editor {Path.GetFileNameWithoutExtension(editorPath)} at {editorPath}";
                         LogException(message, e);
                         Context.API.ShowMsgError(message);
                         return false;