diff --git a/tools/enso4igv/pom.xml b/tools/enso4igv/pom.xml
index 114029b1d8a..df76bed85bd 100644
--- a/tools/enso4igv/pom.xml
+++ b/tools/enso4igv/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>enso4igv</artifactId>
     <packaging>nbm</packaging>
     <name>Enso Language Support for NetBeans &amp; Ideal Graph Visualizer</name>
-    <version>1.40-SNAPSHOT</version>
+    <version>1.41-SNAPSHOT</version>
     <build>
         <plugins>
             <plugin>
diff --git a/tools/enso4igv/src/main/java/org/enso/tools/enso4igv/EnsoActionProvider.java b/tools/enso4igv/src/main/java/org/enso/tools/enso4igv/EnsoActionProvider.java
index a4af1df4018..4428c422af8 100644
--- a/tools/enso4igv/src/main/java/org/enso/tools/enso4igv/EnsoActionProvider.java
+++ b/tools/enso4igv/src/main/java/org/enso/tools/enso4igv/EnsoActionProvider.java
@@ -63,6 +63,7 @@ public final class EnsoActionProvider implements ActionProvider {
 
     @Override
     public void invokeAction(String action, Lookup lkp) throws IllegalArgumentException {
+        var enableDebug = COMMAND_DEBUG_SINGLE.equals(action) || COMMAND_DEBUG.equals(action);
         var process = ActionProgress.start(lkp);
         var params = ExplicitProcessParameters.buildExplicitParameters(lkp);
         var fo = lkp.lookup(FileObject.class);
@@ -89,7 +90,7 @@ public final class EnsoActionProvider implements ActionProvider {
 
                 var b = ProcessBuilder.getLocal();
                 b.setExecutable(file.getPath());
-                b.setArguments(prepareArguments(script));
+                b.setArguments(prepareArguments(script, enableDebug));
                 b.setWorkingDirectory(script.getParent());
                 b.setRedirectErrorStream(true);
 
@@ -135,7 +136,7 @@ public final class EnsoActionProvider implements ActionProvider {
             } else {
                 descriptor = descriptor.controllable(true);
             }
-            var launch = COMMAND_DEBUG_SINGLE.equals(action) || COMMAND_DEBUG.equals(action) ?
+            var launch = enableDebug ?
                 new DebugAndLaunch(fo, builder, params) : builder;
             var service = ExecutionService.newService(launch, descriptor, script.getName());
             service.run();
@@ -199,8 +200,11 @@ public final class EnsoActionProvider implements ActionProvider {
     }
 
 
-    private static List<String> prepareArguments(File script) {
+    private static List<String> prepareArguments(File script, boolean enableJvm) {
         var list = new ArrayList<String>();
+        if (enableJvm) {
+            list.add("--jvm");
+        }
         list.add("--run");
         list.add(script.getPath());
         return list;
diff --git a/tools/enso4igv/src/main/resources/org/enso/tools/enso4igv/layer.xml b/tools/enso4igv/src/main/resources/org/enso/tools/enso4igv/layer.xml
index 3fa2df1ded8..f87ac95976e 100644
--- a/tools/enso4igv/src/main/resources/org/enso/tools/enso4igv/layer.xml
+++ b/tools/enso4igv/src/main/resources/org/enso/tools/enso4igv/layer.xml
@@ -32,6 +32,19 @@
                 <folder name="ToolTips">
                     <file name="org-netbeans-modules-debugger-jpda-truffle-vars-tooltip-ToolTipAnnotation.instance"/>
                 </folder>
+                <file name="org-netbeans-modules-lsp-client-bridge-BridgingLanguageServerProvider.instance">
+                    <!--org.netbeans.modules.lsp.client.newpackage-->
+                    <attr name="instanceOf" stringvalue="org.netbeans.modules.lsp.client.spi.LanguageServerProvider"/>
+                </file>
+                <folder name="SideBar">
+                    <file name="breadcrumbs.instance">
+                        <!--org.netbeans.modules.lsp.client.newpackage-->
+                        <attr name="location" stringvalue="South"/>
+                        <attr intvalue="5237" name="position"/>
+                        <attr boolvalue="false" name="scrollable"/>
+                        <attr methodvalue="org.netbeans.modules.editor.breadcrumbs.spi.BreadcrumbsController.createSideBarFactory" name="instanceCreate"/>
+                    </file>
+                </folder>
             </folder>
         </folder>
     </folder>