From cfda407fabf1ef10390eb00c1f772ebb5d7804e5 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sat, 14 Feb 2026 11:38:39 +0000
Subject: [PATCH] Small fixes

---
 .../java/io/xpipe/app/action/ActionShortcutComp.java     | 9 +++++----
 .../java/io/xpipe/app/terminal/TerminalDockView.java     | 7 +++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/action/ActionShortcutComp.java b/app/src/main/java/io/xpipe/app/action/ActionShortcutComp.java
index 563b81e9f..41b4a0a9b 100644
--- a/app/src/main/java/io/xpipe/app/action/ActionShortcutComp.java
+++ b/app/src/main/java/io/xpipe/app/action/ActionShortcutComp.java
@@ -7,6 +7,7 @@ import io.xpipe.app.comp.base.ButtonComp;
 import io.xpipe.app.comp.base.InputGroupComp;
 import io.xpipe.app.comp.base.TextFieldComp;
 import io.xpipe.app.core.AppI18n;
+import io.xpipe.app.core.AppProperties;
 import io.xpipe.app.platform.BindingsHelper;
 import io.xpipe.app.platform.ClipboardHelper;
 import io.xpipe.app.platform.OptionsBuilder;
@@ -46,8 +47,6 @@ public class ActionShortcutComp extends SimpleRegionBuilder {
                                 AppDistributionType.get().toTranslatedString().getValue()));
         options.addComp(createUrlComp()).disable(!AppDistributionType.get().isSupportsUrls());
         options.nameAndDescription("actionApiCall").addComp(createApiComp());
-        //        options.nameAndDescription("actionMacro")
-        //                .addComp(createMacroComp());
         return options.build();
     }
 
@@ -83,8 +82,10 @@ public class ActionShortcutComp extends SimpleRegionBuilder {
         });
         var copyButton = new ButtonComp(null, new FontIcon("mdi2f-file-move-outline"), () -> {
                     ThreadHelper.runFailableAsync(() -> {
-                        var file =
-                                DesktopShortcuts.createOpen(name.getValue(), "open \"" + url.getValue() + "\"", null);
+                        var file = DesktopShortcuts.createOpen(
+                                name.getValue(),
+                                "open \"" + url.getValue() + "\" -d \"" + AppProperties.get().getDataDir() + "\"",
+                                null);
                         DesktopHelper.browseFileInDirectory(file);
                     });
                 })
diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalDockView.java b/app/src/main/java/io/xpipe/app/terminal/TerminalDockView.java
index 549dfddd1..6a6c07e43 100644
--- a/app/src/main/java/io/xpipe/app/terminal/TerminalDockView.java
+++ b/app/src/main/java/io/xpipe/app/terminal/TerminalDockView.java
@@ -1,6 +1,7 @@
 package io.xpipe.app.terminal;
 
 import io.xpipe.app.issue.TrackEvent;
+import io.xpipe.app.platform.NativeWinWindowControl;
 import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.util.GlobalTimer;
 import io.xpipe.app.util.Rect;
@@ -71,12 +72,18 @@ public class TerminalDockView {
 
     public synchronized void trackTerminal(ControllableTerminalSession terminal, boolean dock) {
         if (viewActive && dock && viewBounds != null) {
+            // Bring main window to foreground since initial launch
+            NativeWinWindowControl.MAIN_WINDOW.activate();
+
             // The window might be minimized
             // We always want to show the terminal though
             terminal.show();
 
             terminal.own();
 
+            // Bring terminal window in front of main window
+            terminal.focus();
+
             terminal.updatePosition(windowBoundsFunction.apply(viewBounds));
             updateCustomBounds();
         }