diff --git a/data/gajim-remote.desktop.in b/data/gajim-remote.desktop.in
deleted file mode 100644
index 71d1645393fff35a81a8158cb001f47f7cd98ea4..0000000000000000000000000000000000000000
--- a/data/gajim-remote.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly;
-Name=Open URI using Gajim
-# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip;
-Version=1.0
-Exec=gajim-remote handle_uri %u
-TryExec=gajim-remote
-StartupNotify=false
-Terminal=false
-Type=Application
-NoDisplay=true
diff --git a/data/org.gajim.Gajim.desktop.in b/data/org.gajim.Gajim.desktop.in
index 521e843347dff7de9a475055e7458be6d11817e8..e2d8674ff750301315bfe31e3bf42b9a039b7249 100644
--- a/data/org.gajim.Gajim.desktop.in
+++ b/data/org.gajim.Gajim.desktop.in
@@ -6,7 +6,7 @@ Comment=A GTK+ Jabber client
 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=chat;messaging;im;xmpp;bonjour;voip;
 Version=1.0
-Exec=gajim
+Exec=gajim %u
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=org.gajim.Gajim
 StartupNotify=true
diff --git a/setup.py b/setup.py
index 0883305cb2ecb733d0b43352d8ba750ba439ba44..8c93f990660bf0f3f8c963644ef5caf423e35c25 100755
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,6 @@ def update_trans():
     template = os.path.join('po', 'gajim.pot')
     files = [os.path.join(root, f) for root, d, files in os.walk('gajim') for f in files if os.path.isfile(
         os.path.join(root, f)) and (f.endswith('.py') or f.endswith('.ui'))]
-    files.append(os.path.join("data", "gajim-remote.desktop.in"))
     files.append(os.path.join("data", "org.gajim.Gajim.desktop.in"))
     files.append(os.path.join("data", "org.gajim.Gajim.appdata.xml.in"))
     cmd = 'xgettext --from-code=utf-8 -o %s %s' % (
@@ -116,7 +115,6 @@ def build_intl(build_cmd):
     base = build_dir
 
     merge_files = (('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'),
-                   ('data/gajim-remote.desktop', 'share/applications', '--desktop'),
                    ('data/org.gajim.Gajim.appdata.xml', 'share/metainfo', '--xml'))
 
     for filename, target, option in merge_files: