diff --git a/source/dialogs/combi.c b/source/dialogs/combi.c
index 0684130c..8a38fb8c 100644
--- a/source/dialogs/combi.c
+++ b/source/dialogs/combi.c
@@ -29,10 +29,7 @@
 #include <stdio.h>
 #include <rofi.h>
 
-#include <dialogs/run.h>
-#include <dialogs/ssh.h>
-#include <dialogs/window.h>
-#include <dialogs/script.h>
+#include <dialogs/dialogs.h>
 
 /**
  * Combi Switcher
@@ -82,6 +79,9 @@ static void combi_mode_parse_switchers ( Switcher *sw )
         else if ( strcasecmp ( token, "run" ) == 0 ) {
             pd->switchers[pd->num_switchers++] = &run_mode;
         }
+        else if ( strcasecmp ( token, "drun" ) == 0 ) {
+            pd->switchers[pd->num_switchers++] = &drun_mode;
+        }
         else {
             // If not build in, use custom switchers.
             Switcher *sw = script_switcher_parse_setup ( token );
diff --git a/source/dialogs/drun.c b/source/dialogs/drun.c
index f60d19ff..2c85d984 100644
--- a/source/dialogs/drun.c
+++ b/source/dialogs/drun.c
@@ -139,8 +139,8 @@ static void get_apps_dir ( DRunModePrivateData *pd, const char *bp )
                     if ( g_key_file_has_key ( kf, "Desktop Entry", "Name", NULL ) ) {
                         gchar *n  = NULL;
                         gchar *gn = NULL;
-                        n  = g_key_file_get_string ( kf, "Desktop Entry", "Name", NULL );
-                        gn = g_key_file_get_string ( kf, "Desktop Entry", "GenericName", NULL );
+                        n  = g_key_file_get_locale_string ( kf, "Desktop Entry", "Name", NULL, NULL );
+                        gn = g_key_file_get_locale_string ( kf, "Desktop Entry", "GenericName", NULL, NULL );
                         if ( gn == NULL ) {
                             pd->cmd_list[pd->cmd_list_length] = g_markup_escape_text ( n, -1 );
                         }