diff --git a/source/dialogs/dmenu.c b/source/dialogs/dmenu.c
index 011920a6..3ded41b3 100644
--- a/source/dialogs/dmenu.c
+++ b/source/dialogs/dmenu.c
@@ -560,7 +560,25 @@ static void dmenu_finalize ( RofiViewState *state )
             restart = ( find_arg ( "-only-match" ) >= 0 );
         }
         else if ( pd->selected_line != UINT32_MAX ) {
-            if ( ( mretv & ( MENU_OK | MENU_QUICK_SWITCH ) ) && cmd_list[pd->selected_line] != NULL ) {
+            if ( ( mretv & MENU_CUSTOM_ACTION ) && pd->multi_select ) {
+                restart = TRUE;
+                if ( pd->selected_list == NULL ) {
+                    pd->selected_list = g_malloc0 ( sizeof ( uint32_t ) * ( pd->cmd_list_length / 32 + 1 ) );
+                }
+                pd->selected_count += ( bitget ( pd->selected_list, pd->selected_line ) ? ( -1 ) : ( 1 ) );
+                bittoggle ( pd->selected_list, pd->selected_line );
+                // Move to next line.
+                pd->selected_line = MIN ( next_pos, cmd_list_length - 1 );
+                if ( pd->selected_count > 0 ) {
+                    char *str = g_strdup_printf ( "%u/%u", pd->selected_count, pd->cmd_list_length );
+                    rofi_view_set_overlay ( state, str );
+                    g_free ( str );
+                }
+                else {
+                    rofi_view_set_overlay ( state, NULL );
+                }
+            }
+            else if ( ( mretv & ( MENU_OK | MENU_QUICK_SWITCH ) ) && cmd_list[pd->selected_line] != NULL ) {
                 dmenu_print_results ( pd, input );
                 retv = TRUE;
                 if ( ( mretv & MENU_QUICK_SWITCH ) ) {
@@ -570,7 +588,9 @@ static void dmenu_finalize ( RofiViewState *state )
                 dmenu_finish ( state, retv );
                 return;
             }
-            pd->selected_line = next_pos - 1;
+            else {
+                pd->selected_line = next_pos - 1;
+            }
         }
         // Restart
         rofi_view_restart ( state );
diff --git a/source/xrmoptions.c b/source/xrmoptions.c
index 355bef58..af8fe846 100644
--- a/source/xrmoptions.c
+++ b/source/xrmoptions.c
@@ -81,128 +81,128 @@ typedef struct
  * Currently supports string, boolean and number (signed and unsigned).
  */
 static XrmOption xrmOptions[] = {
-    { xrm_String,  "switchers",                  { .str  = &config.modi                   }, NULL,
+    { xrm_String,  "switchers",         { .str  = &config.modi                   }, NULL,
       "", CONFIG_DEFAULT },
-    { xrm_String,  "modi",                       { .str  = &config.modi                   }, NULL,
+    { xrm_String,  "modi",              { .str  = &config.modi                   }, NULL,
       "Enabled modi", CONFIG_DEFAULT },
-    { xrm_SNumber, "width",                      { .snum = &config.menu_width             }, NULL,
+    { xrm_SNumber, "width",             { .snum = &config.menu_width             }, NULL,
       "Window width", CONFIG_DEFAULT },
-    { xrm_Number,  "lines",                      { .num  = &config.menu_lines             }, NULL,
+    { xrm_Number,  "lines",             { .num  = &config.menu_lines             }, NULL,
       "Number of lines", CONFIG_DEFAULT },
-    { xrm_Number,  "columns",                    { .num  = &config.menu_columns           }, NULL,
+    { xrm_Number,  "columns",           { .num  = &config.menu_columns           }, NULL,
       "Number of columns", CONFIG_DEFAULT },
 
-    { xrm_String,  "font",                       { .str  = &config.menu_font              }, NULL,
+    { xrm_String,  "font",              { .str  = &config.menu_font              }, NULL,
       "Font to use", CONFIG_DEFAULT },
-    { xrm_Number,  "borderwidth",                { .num  = &config.menu_bw                }, NULL,
+    { xrm_Number,  "borderwidth",       { .num  = &config.menu_bw                }, NULL,
       "", CONFIG_DEFAULT },
-    { xrm_Number,  "bw",                         { .num  = &config.menu_bw                }, NULL,
+    { xrm_Number,  "bw",                { .num  = &config.menu_bw                }, NULL,
       "Border width", CONFIG_DEFAULT },
 
-    { xrm_Number,  "location",                   { .num  = &config.location               }, NULL,
+    { xrm_Number,  "location",          { .num  = &config.location               }, NULL,
       "Location on screen", CONFIG_DEFAULT },
 
-    { xrm_Number,  "padding",                    { .num  = &config.padding                }, NULL,
+    { xrm_Number,  "padding",           { .num  = &config.padding                }, NULL,
       "Padding", CONFIG_DEFAULT },
-    { xrm_SNumber, "yoffset",                    { .snum = &config.y_offset               }, NULL,
+    { xrm_SNumber, "yoffset",           { .snum = &config.y_offset               }, NULL,
       "Y-offset relative to location", CONFIG_DEFAULT },
-    { xrm_SNumber, "xoffset",                    { .snum = &config.x_offset               }, NULL,
+    { xrm_SNumber, "xoffset",           { .snum = &config.x_offset               }, NULL,
       "X-offset relative to location", CONFIG_DEFAULT },
-    { xrm_Boolean, "fixed-num-lines",            { .num  = &config.fixed_num_lines        }, NULL,
+    { xrm_Boolean, "fixed-num-lines",   { .num  = &config.fixed_num_lines        }, NULL,
       "Always show number of lines", CONFIG_DEFAULT },
 
-    { xrm_Boolean, "show-icons",                 { .snum = &config.show_icons             }, NULL,
+    { xrm_Boolean, "show-icons",        { .snum = &config.show_icons             }, NULL,
       "Whether to load and show icons", CONFIG_DEFAULT },
 
-    { xrm_String,  "terminal",                   { .str  = &config.terminal_emulator      }, NULL,
+    { xrm_String,  "terminal",          { .str  = &config.terminal_emulator      }, NULL,
       "Terminal to use", CONFIG_DEFAULT },
-    { xrm_String,  "ssh-client",                 { .str  = &config.ssh_client             }, NULL,
+    { xrm_String,  "ssh-client",        { .str  = &config.ssh_client             }, NULL,
       "Ssh client to use", CONFIG_DEFAULT },
-    { xrm_String,  "ssh-command",                { .str  = &config.ssh_command            }, NULL,
+    { xrm_String,  "ssh-command",       { .str  = &config.ssh_command            }, NULL,
       "Ssh command to execute", CONFIG_DEFAULT },
-    { xrm_String,  "run-command",                { .str  = &config.run_command            }, NULL,
+    { xrm_String,  "run-command",       { .str  = &config.run_command            }, NULL,
       "Run command to execute", CONFIG_DEFAULT },
-    { xrm_String,  "run-list-command",           { .str  = &config.run_list_command       }, NULL,
+    { xrm_String,  "run-list-command",  { .str  = &config.run_list_command       }, NULL,
       "Command to get extra run targets", CONFIG_DEFAULT },
-    { xrm_String,  "run-shell-command",          { .str  = &config.run_shell_command      }, NULL,
+    { xrm_String,  "run-shell-command", { .str  = &config.run_shell_command      }, NULL,
       "Run command to execute that runs in shell", CONFIG_DEFAULT },
-    { xrm_String,  "window-command",             { .str  = &config.window_command         }, NULL,
+    { xrm_String,  "window-command",    { .str  = &config.window_command         }, NULL,
       "Command executed on accep-entry-custom for window modus", CONFIG_DEFAULT },
-    { xrm_String,  "drun-icon-theme",            { .str  = &config.drun_icon_theme        }, NULL,
+    { xrm_String,  "drun-icon-theme",   { .str  = &config.drun_icon_theme        }, NULL,
       "Theme to use to look for icons", CONFIG_DEFAULT },
 
-    { xrm_Boolean, "disable-history",            { .num  = &config.disable_history        }, NULL,
+    { xrm_Boolean, "disable-history",   { .num  = &config.disable_history        }, NULL,
       "Disable history in run/ssh", CONFIG_DEFAULT },
-    { xrm_Boolean, "sort",                       { .num  = &config.sort                   }, NULL,
+    { xrm_Boolean, "sort",              { .num  = &config.sort                   }, NULL,
       "Use sorting", CONFIG_DEFAULT },
-    { xrm_Boolean, "levenshtein-sort",           { .num  = &config.levenshtein_sort       }, NULL,
+    { xrm_Boolean, "levenshtein-sort",  { .num  = &config.levenshtein_sort       }, NULL,
       "Use levenshtein sorting also for fuzzy matching", CONFIG_DEFAULT },
-    { xrm_Boolean, "case-sensitive",             { .num  = &config.case_sensitive         }, NULL,
+    { xrm_Boolean, "case-sensitive",    { .num  = &config.case_sensitive         }, NULL,
       "Set case-sensitivity", CONFIG_DEFAULT },
-    { xrm_Boolean, "cycle",                      { .num  = &config.cycle                  }, NULL,
+    { xrm_Boolean, "cycle",             { .num  = &config.cycle                  }, NULL,
       "Cycle through the results list", CONFIG_DEFAULT },
-    { xrm_Boolean, "sidebar-mode",               { .num  = &config.sidebar_mode           }, NULL,
+    { xrm_Boolean, "sidebar-mode",      { .num  = &config.sidebar_mode           }, NULL,
       "Enable sidebar-mode", CONFIG_DEFAULT },
-    { xrm_SNumber, "eh",                         { .snum = &config.element_height         }, NULL,
+    { xrm_SNumber, "eh",                { .snum = &config.element_height         }, NULL,
       "Row height (in chars)", CONFIG_DEFAULT },
-    { xrm_Boolean, "auto-select",                { .num  = &config.auto_select            }, NULL,
+    { xrm_Boolean, "auto-select",       { .num  = &config.auto_select            }, NULL,
       "Enable auto select mode", CONFIG_DEFAULT },
-    { xrm_Boolean, "parse-hosts",                { .num  = &config.parse_hosts            }, NULL,
+    { xrm_Boolean, "parse-hosts",       { .num  = &config.parse_hosts            }, NULL,
       "Parse hosts file for ssh mode", CONFIG_DEFAULT },
-    { xrm_Boolean, "parse-known-hosts",          { .num  = &config.parse_known_hosts      }, NULL,
+    { xrm_Boolean, "parse-known-hosts", { .num  = &config.parse_known_hosts      }, NULL,
       "Parse known_hosts file for ssh mode", CONFIG_DEFAULT },
-    { xrm_String,  "combi-modi",                 { .str  = &config.combi_modi             }, NULL,
+    { xrm_String,  "combi-modi",        { .str  = &config.combi_modi             }, NULL,
       "Set the modi to combine in combi mode", CONFIG_DEFAULT },
-    { xrm_String,  "matching",                   { .str  = &config.matching               }, NULL,
+    { xrm_String,  "matching",          { .str  = &config.matching               }, NULL,
       "Set the matching algorithm. (normal, regex, glob, fuzzy)", CONFIG_DEFAULT },
-    { xrm_Boolean, "tokenize",                   { .num  = &config.tokenize               }, NULL,
+    { xrm_Boolean, "tokenize",          { .num  = &config.tokenize               }, NULL,
       "Tokenize input string", CONFIG_DEFAULT },
-    { xrm_String,  "monitor",                    { .str  = &config.monitor                }, NULL,
+    { xrm_String,  "monitor",           { .str  = &config.monitor                }, NULL,
       "", CONFIG_DEFAULT },
     /* Alias for dmenu compatibility. */
-    { xrm_String,  "m",                          { .str  = &config.monitor                }, NULL,
+    { xrm_String,  "m",                 { .str  = &config.monitor                }, NULL,
       "Monitor id to show on", CONFIG_DEFAULT },
-    { xrm_Number,  "line-margin",                { .num  = &config.line_margin            }, NULL,
+    { xrm_Number,  "line-margin",       { .num  = &config.line_margin            }, NULL,
       "Margin between rows *DEPRECATED*", CONFIG_DEFAULT },
-    { xrm_Number,  "line-padding",               { .num  = &config.line_padding           }, NULL,
+    { xrm_Number,  "line-padding",      { .num  = &config.line_padding           }, NULL,
       "Padding within rows *DEPRECATED*", CONFIG_DEFAULT },
-    { xrm_String,  "filter",                     { .str  = &config.filter                 }, NULL,
+    { xrm_String,  "filter",            { .str  = &config.filter                 }, NULL,
       "Pre-set filter", CONFIG_DEFAULT },
-    { xrm_String,  "separator-style",            { .str  = &config.separator_style        }, NULL,
+    { xrm_String,  "separator-style",   { .str  = &config.separator_style        }, NULL,
       "Separator style (none, dash, solid) *DEPRECATED*", CONFIG_DEFAULT },
-    { xrm_Boolean, "hide-scrollbar",             { .num  = &config.hide_scrollbar         }, NULL,
+    { xrm_Boolean, "hide-scrollbar",    { .num  = &config.hide_scrollbar         }, NULL,
       "Hide scroll-bar *DEPRECATED*", CONFIG_DEFAULT },
-    { xrm_Boolean, "fullscreen",                 { .num  = &config.fullscreen             }, NULL,
+    { xrm_Boolean, "fullscreen",        { .num  = &config.fullscreen             }, NULL,
       "Fullscreen", CONFIG_DEFAULT },
-    { xrm_Boolean, "fake-transparency",          { .num  = &config.fake_transparency      }, NULL,
+    { xrm_Boolean, "fake-transparency", { .num  = &config.fake_transparency      }, NULL,
       "Fake transparency *DEPRECATED*", CONFIG_DEFAULT },
-    { xrm_SNumber, "dpi",                        { .snum = &config.dpi                    }, NULL,
+    { xrm_SNumber, "dpi",               { .snum = &config.dpi                    }, NULL,
       "DPI", CONFIG_DEFAULT },
-    { xrm_Number,  "threads",                    { .num  = &config.threads                }, NULL,
+    { xrm_Number,  "threads",           { .num  = &config.threads                }, NULL,
       "Threads to use for string matching", CONFIG_DEFAULT },
-    { xrm_Number,  "scrollbar-width",            { .num  = &config.scrollbar_width        }, NULL,
+    { xrm_Number,  "scrollbar-width",   { .num  = &config.scrollbar_width        }, NULL,
       "Scrollbar width *DEPRECATED*", CONFIG_DEFAULT },
-    { xrm_Number,  "scroll-method",              { .num  = &config.scroll_method          }, NULL,
+    { xrm_Number,  "scroll-method",     { .num  = &config.scroll_method          }, NULL,
       "Scrolling method. (0: Page, 1: Centered)", CONFIG_DEFAULT },
-    { xrm_String,  "fake-background",            { .str  = &config.fake_background        }, NULL,
+    { xrm_String,  "fake-background",   { .str  = &config.fake_background        }, NULL,
       "Background to use for fake transparency. (background or screenshot)", CONFIG_DEFAULT },
-    { xrm_String,  "window-format", { .str  = &config.window_format          }, NULL,
+    { xrm_String,  "window-format",     { .str  = &config.window_format          }, NULL,
       "Window Format. w (desktop name), t (title), n (name), r (role), c (class) *DEPRECATED*", CONFIG_DEFAULT },
-    { xrm_Boolean, "click-to-exit",              { .snum = &config.click_to_exit          }, NULL,
+    { xrm_Boolean, "click-to-exit",     { .snum = &config.click_to_exit          }, NULL,
       "Click outside the window to exit", CONFIG_DEFAULT },
-    { xrm_Boolean, "show-match",                 { .snum = &config.show_match             }, NULL,
+    { xrm_Boolean, "show-match",        { .snum = &config.show_match             }, NULL,
       "Indicate how it match by underlining it.", CONFIG_DEFAULT },
-    { xrm_String,  "theme",                      { .str  = &config.theme                  }, NULL,
+    { xrm_String,  "theme",             { .str  = &config.theme                  }, NULL,
       "New style theme file", CONFIG_DEFAULT },
-    { xrm_String,  "color-normal",               { .str  = &config.color_normal           }, NULL,
+    { xrm_String,  "color-normal",      { .str  = &config.color_normal           }, NULL,
       "Color scheme for normal row", CONFIG_DEFAULT },
-    { xrm_String,  "color-urgent",               { .str  = &config.color_urgent           }, NULL,
+    { xrm_String,  "color-urgent",      { .str  = &config.color_urgent           }, NULL,
       "Color scheme for urgent row", CONFIG_DEFAULT },
-    { xrm_String,  "color-active",               { .str  = &config.color_active           }, NULL,
+    { xrm_String,  "color-active",      { .str  = &config.color_active           }, NULL,
       "Color scheme for active row", CONFIG_DEFAULT },
-    { xrm_String,  "color-window",               { .str  = &config.color_window           }, NULL,
+    { xrm_String,  "color-window",      { .str  = &config.color_window           }, NULL,
       "Color scheme window", CONFIG_DEFAULT },
-    { xrm_String,  "plugin-path",                { .str  = &config.plugin_path            }, NULL,
+    { xrm_String,  "plugin-path",       { .str  = &config.plugin_path            }, NULL,
       "Directory containing plugins", CONFIG_DEFAULT },
 };