diff --git a/debian/changelog b/debian/changelog
index ecfd8b0..694100f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cairo-dock (3.4.1+git20201103.0836f5d1+git20210327.3.6c569e6-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+  * New upstream snapshot.
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 07 Jun 2022 16:30:32 -0000
+
 cairo-dock (3.4.1+git20201103.0836f5d1-1) unstable; urgency=medium
 
   * Snapshot, taken from the master (20201103). (Closes: #963494)
diff --git a/debian/patches/0001-Fix-Spelling-Error.patch b/debian/patches/0001-Fix-Spelling-Error.patch
index bc76d19..a4994ef 100644
--- a/debian/patches/0001-Fix-Spelling-Error.patch
+++ b/debian/patches/0001-Fix-Spelling-Error.patch
@@ -10,11 +10,11 @@ Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
  src/implementations/cairo-dock-X-utilities.c | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/src/cairo-dock-user-menu.c b/src/cairo-dock-user-menu.c
-index aa93cb9..5ed8fcd 100644
---- a/src/cairo-dock-user-menu.c
-+++ b/src/cairo-dock-user-menu.c
-@@ -926,7 +926,7 @@ static void _cairo_dock_set_custom_appli_icon (G_GNUC_UNUSED GtkMenuItem *pMenuI
+Index: cairo-dock/src/cairo-dock-user-menu.c
+===================================================================
+--- cairo-dock.orig/src/cairo-dock-user-menu.c
++++ cairo-dock/src/cairo-dock-user-menu.c
+@@ -926,7 +926,7 @@ static void _cairo_dock_set_custom_appli
  			}  // apres la boucle, i = nbre d'elements, j = l'element qui a ete enleve.
  			if (j != -1)  // un element a ete enleve.
  			{
@@ -23,11 +23,11 @@ index aa93cb9..5ed8fcd 100644
  				if (j < i - 1)  // ce n'est pas le dernier
  				{
  					pExceptions[j] = pExceptions[i-1];
-diff --git a/src/implementations/cairo-dock-X-manager.c b/src/implementations/cairo-dock-X-manager.c
-index 373140f..dfe7ade 100644
---- a/src/implementations/cairo-dock-X-manager.c
-+++ b/src/implementations/cairo-dock-X-manager.c
-@@ -581,7 +581,7 @@ static gboolean _cairo_dock_unstack_Xevents (G_GNUC_UNUSED gpointer data)
+Index: cairo-dock/src/implementations/cairo-dock-X-manager.c
+===================================================================
+--- cairo-dock.orig/src/implementations/cairo-dock-X-manager.c
++++ cairo-dock/src/implementations/cairo-dock-X-manager.c
+@@ -581,7 +581,7 @@ static gboolean _cairo_dock_unstack_Xeve
  						if (xactor->bIgnored)  // was ignored, simply recreate it
  						{
  							// remove it from the table, so that the XEvent loop detects it again
@@ -36,11 +36,11 @@ index 373140f..dfe7ade 100644
  							xactor->iLastCheckTime = -1;
  							_delete_actor (xactor);  // unref it since we don't need it anymore
  						}
-diff --git a/src/implementations/cairo-dock-X-utilities.c b/src/implementations/cairo-dock-X-utilities.c
-index 26217da..e399b6d 100644
---- a/src/implementations/cairo-dock-X-utilities.c
-+++ b/src/implementations/cairo-dock-X-utilities.c
-@@ -1581,7 +1581,7 @@ cairo_surface_t *cairo_dock_create_surface_from_xpixmap (Pixmap Xid, int iWidth,
+Index: cairo-dock/src/implementations/cairo-dock-X-utilities.c
+===================================================================
+--- cairo-dock.orig/src/implementations/cairo-dock-X-utilities.c
++++ cairo-dock/src/implementations/cairo-dock-X-utilities.c
+@@ -1581,7 +1581,7 @@ cairo_surface_t *cairo_dock_create_surfa
  	GdkPixbuf *pPixbuf = cairo_dock_get_pixbuf_from_pixmap (Xid, TRUE);
  	if (pPixbuf == NULL)
  	{
@@ -49,6 +49,3 @@ index 26217da..e399b6d 100644
  		return NULL;
  	}
  	
--- 
-2.30.0.rc2
-
diff --git a/debian/patches/0002-Use-gnome-calculator-instead-of-gcalctool.patch b/debian/patches/0002-Use-gnome-calculator-instead-of-gcalctool.patch
index 747f153..705ea92 100644
--- a/debian/patches/0002-Use-gnome-calculator-instead-of-gcalctool.patch
+++ b/debian/patches/0002-Use-gnome-calculator-instead-of-gcalctool.patch
@@ -15,23 +15,120 @@ Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
  rename data/themes/default-theme-panel/launchers/{01gcalctool.desktop => 01gnome-calculator.desktop} (94%)
  rename data/themes/default-theme/launchers/{01gcalctool.desktop => 01gnome-calculator.desktop} (94%)
 
-diff --git a/data/themes/default-theme-panel/launchers/01gcalctool.desktop b/data/themes/default-theme-panel/launchers/01gnome-calculator.desktop
-similarity index 94%
-rename from data/themes/default-theme-panel/launchers/01gcalctool.desktop
-rename to data/themes/default-theme-panel/launchers/01gnome-calculator.desktop
-index 406aeca..c800680 100644
---- a/data/themes/default-theme-panel/launchers/01gcalctool.desktop
-+++ b/data/themes/default-theme-panel/launchers/01gnome-calculator.desktop
-@@ -47,4 +47,4 @@ Order=6.25
- 
- Icon Type=0
- Type=Application
+Index: cairo-dock/data/themes/default-theme-panel/launchers/01gcalctool.desktop
+===================================================================
+--- cairo-dock.orig/data/themes/default-theme-panel/launchers/01gcalctool.desktop
++++ /dev/null
+@@ -1,50 +0,0 @@
+-#3.3.99.beta1
+-
+-#[gtk-about]
+-
+-[Desktop Entry]
+-
+-#F[Icon]
+-frame_maininfo=
+-
+-#d+ Name of the container it belongs to:
+-Container=_MainDock_
+-
+-#v
+-sep_display=
+-
+-#s[Default] Launcher's name:
+-Name=
+-
+-#S+[Default] Image's name or path:
+-Icon=
+-
+-#s[Default] Command to launch on click:
+-#{Example: nautilus --no-desktop, gedit, etc. You can even enter a shortkey, e.g. <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
+-Exec=
+-
+-
+-#X[Extra parameters]
+-frame_extra=
+-
+-#b Don't link the launcher with its window
+-#{If you chose to mix launcher and applications, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the terminal's icon from the taskbar.} 
+-prevent inhibate=false
+-
+-#K[Default] Class of the program:
+-#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the application with its launcher.}
+-StartupWMClass=
+-
+-#b Run in a terminal?
+-Terminal=false
+-
+-#i-[0;16] Only show in this specific viewport:
+-#{If '0' the launcher will be displayed on every viewport.}
+-ShowOnViewport=0
+-
+-#f[0;100] Order you want for this launcher among the others:
+-Order=6.25
+-
+-Icon Type=0
+-Type=Application
 -Origin=/usr/share/applications/gcalctool.desktop;kcalc.desktop;galculator.desktop
+Index: cairo-dock/data/themes/default-theme-panel/launchers/01gnome-calculator.desktop
+===================================================================
+--- /dev/null
++++ cairo-dock/data/themes/default-theme-panel/launchers/01gnome-calculator.desktop
+@@ -0,0 +1,50 @@
++#3.3.99.beta1
++
++#[gtk-about]
++
++[Desktop Entry]
++
++#F[Icon]
++frame_maininfo=
++
++#d+ Name of the container it belongs to:
++Container=_MainDock_
++
++#v
++sep_display=
++
++#s[Default] Launcher's name:
++Name=
++
++#S+[Default] Image's name or path:
++Icon=
++
++#s[Default] Command to launch on click:
++#{Example: nautilus --no-desktop, gedit, etc. You can even enter a shortkey, e.g. <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
++Exec=
++
++
++#X[Extra parameters]
++frame_extra=
++
++#b Don't link the launcher with its window
++#{If you chose to mix launcher and applications, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the terminal's icon from the taskbar.} 
++prevent inhibate=false
++
++#K[Default] Class of the program:
++#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the application with its launcher.}
++StartupWMClass=
++
++#b Run in a terminal?
++Terminal=false
++
++#i-[0;16] Only show in this specific viewport:
++#{If '0' the launcher will be displayed on every viewport.}
++ShowOnViewport=0
++
++#f[0;100] Order you want for this launcher among the others:
++Order=6.25
++
++Icon Type=0
++Type=Application
 +Origin=/usr/share/applications/gnome-calculator.desktop;kcalc.desktop
-diff --git a/data/themes/default-theme-panel/launchers/CMakeLists.txt b/data/themes/default-theme-panel/launchers/CMakeLists.txt
-index 2025d9d..4f31229 100644
---- a/data/themes/default-theme-panel/launchers/CMakeLists.txt
-+++ b/data/themes/default-theme-panel/launchers/CMakeLists.txt
+Index: cairo-dock/data/themes/default-theme-panel/launchers/CMakeLists.txt
+===================================================================
+--- cairo-dock.orig/data/themes/default-theme-panel/launchers/CMakeLists.txt
++++ cairo-dock/data/themes/default-theme-panel/launchers/CMakeLists.txt
 @@ -4,7 +4,7 @@
  install(FILES
  	01container.desktop
@@ -41,23 +138,120 @@ index 2025d9d..4f31229 100644
  	01libreoffice-calc.desktop
  	01libreoffice-impress.desktop
  	01libreoffice-writer.desktop
-diff --git a/data/themes/default-theme/launchers/01gcalctool.desktop b/data/themes/default-theme/launchers/01gnome-calculator.desktop
-similarity index 94%
-rename from data/themes/default-theme/launchers/01gcalctool.desktop
-rename to data/themes/default-theme/launchers/01gnome-calculator.desktop
-index 1ab6a99..d7b7398 100644
---- a/data/themes/default-theme/launchers/01gcalctool.desktop
-+++ b/data/themes/default-theme/launchers/01gnome-calculator.desktop
-@@ -47,4 +47,4 @@ Order=4
- 
- Icon Type=0
- Type=Application
+Index: cairo-dock/data/themes/default-theme/launchers/01gcalctool.desktop
+===================================================================
+--- cairo-dock.orig/data/themes/default-theme/launchers/01gcalctool.desktop
++++ /dev/null
+@@ -1,50 +0,0 @@
+-#3.3.99.beta1
+-
+-#[gtk-about]
+-
+-[Desktop Entry]
+-
+-#F[Icon]
+-frame_maininfo=
+-
+-#d+ Name of the container it belongs to:
+-Container=_MainDock_
+-
+-#v
+-sep_display=
+-
+-#s[Default] Launcher's name:
+-Name=
+-
+-#S+[Default] Image's name or path:
+-Icon=
+-
+-#s[Default] Command to launch on click:
+-#{Example: nautilus --no-desktop, gedit, etc. You can even enter a shortkey, e.g. <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
+-Exec=
+-
+-
+-#X[Extra parameters]
+-frame_extra=
+-
+-#b Don't link the launcher with its window
+-#{If you chose to mix launcher and applications, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the terminal's icon from the taskbar.} 
+-prevent inhibate=false
+-
+-#K[Default] Class of the program:
+-#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the application with its launcher.}
+-StartupWMClass=
+-
+-#b Run in a terminal?
+-Terminal=false
+-
+-#i-[0;16] Only show in this specific viewport:
+-#{If '0' the launcher will be displayed on every viewport.}
+-ShowOnViewport=0
+-
+-#f[0;100] Order you want for this launcher among the others:
+-Order=4
+-
+-Icon Type=0
+-Type=Application
 -Origin=/usr/share/applications/gcalctool.desktop;kcalc.desktop;galculator.desktop
+Index: cairo-dock/data/themes/default-theme/launchers/01gnome-calculator.desktop
+===================================================================
+--- /dev/null
++++ cairo-dock/data/themes/default-theme/launchers/01gnome-calculator.desktop
+@@ -0,0 +1,50 @@
++#3.3.99.beta1
++
++#[gtk-about]
++
++[Desktop Entry]
++
++#F[Icon]
++frame_maininfo=
++
++#d+ Name of the container it belongs to:
++Container=_MainDock_
++
++#v
++sep_display=
++
++#s[Default] Launcher's name:
++Name=
++
++#S+[Default] Image's name or path:
++Icon=
++
++#s[Default] Command to launch on click:
++#{Example: nautilus --no-desktop, gedit, etc. You can even enter a shortkey, e.g. <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
++Exec=
++
++
++#X[Extra parameters]
++frame_extra=
++
++#b Don't link the launcher with its window
++#{If you chose to mix launcher and applications, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the terminal's icon from the taskbar.} 
++prevent inhibate=false
++
++#K[Default] Class of the program:
++#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the application with its launcher.}
++StartupWMClass=
++
++#b Run in a terminal?
++Terminal=false
++
++#i-[0;16] Only show in this specific viewport:
++#{If '0' the launcher will be displayed on every viewport.}
++ShowOnViewport=0
++
++#f[0;100] Order you want for this launcher among the others:
++Order=4
++
++Icon Type=0
++Type=Application
 +Origin=/usr/share/applications/gnome-calculator.desktop;kcalc.desktop
-diff --git a/data/themes/default-theme/launchers/CMakeLists.txt b/data/themes/default-theme/launchers/CMakeLists.txt
-index b9566d4..5da53b5 100644
---- a/data/themes/default-theme/launchers/CMakeLists.txt
-+++ b/data/themes/default-theme/launchers/CMakeLists.txt
+Index: cairo-dock/data/themes/default-theme/launchers/CMakeLists.txt
+===================================================================
+--- cairo-dock.orig/data/themes/default-theme/launchers/CMakeLists.txt
++++ cairo-dock/data/themes/default-theme/launchers/CMakeLists.txt
 @@ -3,7 +3,7 @@
  
  install(FILES
@@ -67,10 +261,10 @@ index b9566d4..5da53b5 100644
  	01gimp.desktop
  	01gnome-terminal.desktop
  	01ooo-writer.desktop
-diff --git a/tests/config.py b/tests/config.py
-index 51166b2..eb7cfe5 100644
---- a/tests/config.py
-+++ b/tests/config.py
+Index: cairo-dock/tests/config.py
+===================================================================
+--- cairo-dock.orig/tests/config.py
++++ cairo-dock/tests/config.py
 @@ -1,10 +1,7 @@
  
 -#exe = 'galculator' # name of a program that can be launched several times, and is usually not running
@@ -83,6 +277,3 @@ index 51166b2..eb7cfe5 100644
  
  exe1 = 'gnome-session-properties'  # a program that doesn't have a launcher yet
  wmclass1 = 'gnome-session-properties'  # its class
--- 
-2.30.0.rc2
-
diff --git a/debian/patches/0003-Adapt-to-gsd-3.24.patch b/debian/patches/0003-Adapt-to-gsd-3.24.patch
index fbbc545..0a2c05d 100644
--- a/debian/patches/0003-Adapt-to-gsd-3.24.patch
+++ b/debian/patches/0003-Adapt-to-gsd-3.24.patch
@@ -11,10 +11,10 @@ Bug-Debian: https://bugs.debian.org/870229
  data/desktop-manager/gnome-session-3.0/cairo-dock.session       | 2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/data/desktop-manager/gnome-session-3.0/cairo-dock-fallback.session b/data/desktop-manager/gnome-session-3.0/cairo-dock-fallback.session
-index b06b2ed..a467c50 100644
---- a/data/desktop-manager/gnome-session-3.0/cairo-dock-fallback.session
-+++ b/data/desktop-manager/gnome-session-3.0/cairo-dock-fallback.session
+Index: cairo-dock/data/desktop-manager/gnome-session-3.0/cairo-dock-fallback.session
+===================================================================
+--- cairo-dock.orig/data/desktop-manager/gnome-session-3.0/cairo-dock-fallback.session
++++ cairo-dock/data/desktop-manager/gnome-session-3.0/cairo-dock-fallback.session
 @@ -1,6 +1,6 @@
  [GNOME Session]
  Name=Cairo-Dock Session fallback (Safe Mode)
@@ -23,10 +23,10 @@ index b06b2ed..a467c50 100644
  RequiredProviders=windowmanager;panel;
  DefaultProvider-windowmanager=metacity
  DefaultProvider-panel=cairo-dock
-diff --git a/data/desktop-manager/gnome-session-3.0/cairo-dock-unity-fallback.session b/data/desktop-manager/gnome-session-3.0/cairo-dock-unity-fallback.session
-index 72c5a12..c58c7ab 100644
---- a/data/desktop-manager/gnome-session-3.0/cairo-dock-unity-fallback.session
-+++ b/data/desktop-manager/gnome-session-3.0/cairo-dock-unity-fallback.session
+Index: cairo-dock/data/desktop-manager/gnome-session-3.0/cairo-dock-unity-fallback.session
+===================================================================
+--- cairo-dock.orig/data/desktop-manager/gnome-session-3.0/cairo-dock-unity-fallback.session
++++ cairo-dock/data/desktop-manager/gnome-session-3.0/cairo-dock-unity-fallback.session
 @@ -1,6 +1,6 @@
  [GNOME Session]
  Name=Cairo-Dock Session with Unity fallback (Safe Mode)
@@ -35,10 +35,10 @@ index 72c5a12..c58c7ab 100644
  RequiredProviders=windowmanager;panel;panel_top;
  DefaultProvider-windowmanager=metacity
  DefaultProvider-panel=cairo-dock
-diff --git a/data/desktop-manager/gnome-session-3.0/cairo-dock-unity.session b/data/desktop-manager/gnome-session-3.0/cairo-dock-unity.session
-index 13b4c0f..bc716b4 100644
---- a/data/desktop-manager/gnome-session-3.0/cairo-dock-unity.session
-+++ b/data/desktop-manager/gnome-session-3.0/cairo-dock-unity.session
+Index: cairo-dock/data/desktop-manager/gnome-session-3.0/cairo-dock-unity.session
+===================================================================
+--- cairo-dock.orig/data/desktop-manager/gnome-session-3.0/cairo-dock-unity.session
++++ cairo-dock/data/desktop-manager/gnome-session-3.0/cairo-dock-unity.session
 @@ -1,6 +1,6 @@
  [GNOME Session]
  Name=Cairo-Dock Session with Unity
@@ -47,10 +47,10 @@ index 13b4c0f..bc716b4 100644
  RequiredProviders=windowmanager;panel;panel_top;
  DefaultProvider-windowmanager=compiz
  DefaultProvider-panel=cairo-dock
-diff --git a/data/desktop-manager/gnome-session-3.0/cairo-dock.session b/data/desktop-manager/gnome-session-3.0/cairo-dock.session
-index 2d62d50..9bfaa74 100644
---- a/data/desktop-manager/gnome-session-3.0/cairo-dock.session
-+++ b/data/desktop-manager/gnome-session-3.0/cairo-dock.session
+Index: cairo-dock/data/desktop-manager/gnome-session-3.0/cairo-dock.session
+===================================================================
+--- cairo-dock.orig/data/desktop-manager/gnome-session-3.0/cairo-dock.session
++++ cairo-dock/data/desktop-manager/gnome-session-3.0/cairo-dock.session
 @@ -1,6 +1,6 @@
  [GNOME Session]
  Name=Cairo-Dock Session
@@ -59,6 +59,3 @@ index 2d62d50..9bfaa74 100644
  RequiredProviders=windowmanager;panel;
  DefaultProvider-windowmanager=compiz
  DefaultProvider-panel=cairo-dock
--- 
-2.30.0.rc2
-
diff --git a/debian/patches/0004-Use-long-ID-of-GPG.patch b/debian/patches/0004-Use-long-ID-of-GPG.patch
index fb4bf4e..59de882 100644
--- a/debian/patches/0004-Use-long-ID-of-GPG.patch
+++ b/debian/patches/0004-Use-long-ID-of-GPG.patch
@@ -8,10 +8,10 @@ Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
  data/scripts/help_scripts.sh | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/data/scripts/help_scripts.sh b/data/scripts/help_scripts.sh
-index e699761..893fe5e 100755
---- a/data/scripts/help_scripts.sh
-+++ b/data/scripts/help_scripts.sh
+Index: cairo-dock/data/scripts/help_scripts.sh
+===================================================================
+--- cairo-dock.orig/data/scripts/help_scripts.sh
++++ cairo-dock/data/scripts/help_scripts.sh
 @@ -58,13 +58,13 @@ repository() {
  
  ppa() {
@@ -28,6 +28,3 @@ index e699761..893fe5e 100755
  	up_install
  }
  
--- 
-2.30.0.rc2
-
diff --git a/debian/patches/0005-Change-version-to-3.4.1-in-CMakeLists.txt.patch b/debian/patches/0005-Change-version-to-3.4.1-in-CMakeLists.txt.patch
index 7024fc5..9f13adb 100644
--- a/debian/patches/0005-Change-version-to-3.4.1-in-CMakeLists.txt.patch
+++ b/debian/patches/0005-Change-version-to-3.4.1-in-CMakeLists.txt.patch
@@ -8,11 +8,11 @@ Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
  CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a2421b0..871465e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,7 +11,7 @@ include ("${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/GNUInstallDirs.cmake")
+Index: cairo-dock/CMakeLists.txt
+===================================================================
+--- cairo-dock.orig/CMakeLists.txt
++++ cairo-dock/CMakeLists.txt
+@@ -11,7 +11,7 @@ include ("${CMAKE_CURRENT_SOURCE_DIR}/cm
  ########### project ###############
  
  project ("cairo-dock")
@@ -21,6 +21,3 @@ index a2421b0..871465e 100644
  
  add_definitions (-std=c99 -Wall -Wextra -Werror-implicit-function-declaration) # -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration -Wstrict-prototypes -Wreturn-type -Wparentheses -Warray-bounds)
  if (NOT DEFINED CMAKE_BUILD_TYPE)
--- 
-2.30.0.rc2
-
diff --git a/src/gldit/cairo-dock-file-manager.c b/src/gldit/cairo-dock-file-manager.c
index fb6bbb5..3f12deb 100644
--- a/src/gldit/cairo-dock-file-manager.c
+++ b/src/gldit/cairo-dock-file-manager.c
@@ -491,7 +491,18 @@ gboolean cairo_dock_copy_file (const gchar *cFilePath, const gchar *cDestPath)
 	gboolean ret = TRUE;
 	// open both files
 	int src_fd = open (cFilePath, O_RDONLY);
-	int dest_fd = open (cDestPath, O_CREAT | O_WRONLY, S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH);  // mode=644
+	int dest_fd;
+	if (g_file_test (cDestPath, G_FILE_TEST_IS_DIR))
+	{
+		const gchar *cFileName = strrchr(cFilePath, '/');
+		gchar *cFileDest = g_strdup_printf("%s/%s", cDestPath, cFileName ? cFileName : cFilePath);
+		dest_fd = open (cFileDest, O_CREAT | O_WRONLY, S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH);  // mode=644
+		g_free(cFileDest);
+	}
+	else
+	{
+		dest_fd = open (cDestPath, O_CREAT | O_WRONLY, S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH);  // mode=644
+	}
 	struct stat stat;
 	// get data size to be copied
 	if (fstat (src_fd, &stat) < 0)