diff --git a/FAQ.md b/FAQ.md
index d85d28d4b..ec8f1478e 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -42,7 +42,7 @@ and instead delegates this to your existing command-line tools.
 For this approach to work however, you need to have the required tools installed.
 
 For example, if you want to connect to a remote system via SSH with X-Pipe,
-you need to have an `SSH` client installed and added to your PATH.
+you need to have an `ssh` client installed and added to your PATH.
 The exact vendor and version of this `ssh` command-line
 tool doesn't matter as long as the standard options are supported.
 
diff --git a/app/src/main/java/io/xpipe/app/browser/FileContextMenu.java b/app/src/main/java/io/xpipe/app/browser/FileContextMenu.java
index f3546fc6a..d6de71c7c 100644
--- a/app/src/main/java/io/xpipe/app/browser/FileContextMenu.java
+++ b/app/src/main/java/io/xpipe/app/browser/FileContextMenu.java
@@ -148,7 +148,7 @@ final class FileContextMenu extends ContextMenu {
                 var clipboard = FileBrowserClipboard.retrieveCopy();
                 if (clipboard != null) {
                     var files = clipboard.getEntries();
-                    var target = model.getCurrentDirectory();
+                    var target = entry.isDirectory() ? entry : model.getCurrentDirectory();
                     model.dropFilesIntoAsync(target, files, true);
                 }
                 event.consume();
diff --git a/dist/changelogs/0.5.40.md b/dist/changelogs/0.5.40.md
new file mode 100644
index 000000000..5bd1ccbcd
--- /dev/null
+++ b/dist/changelogs/0.5.40.md
@@ -0,0 +1,4 @@
+## Changes in 0.5.40
+- Add status bar to file browser that shows selected entries and clipboard
+- Add native ARM builds for macOS
+- Improve Kubernetes support and configuration options
\ No newline at end of file
diff --git a/version b/version
index c72f2c543..841aff595 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.5.39
\ No newline at end of file
+0.5.40
\ No newline at end of file