diff --git a/README.md b/README.md
index 7026527f..0781683c 100644
--- a/README.md
+++ b/README.md
@@ -162,7 +162,8 @@ Parameters that are enabled by default have to be explicitly disabled. These (cu
| `io_read`
`io_write` | Show non-cached IO read/write, in MiB/s |
| `pci_dev` | Select GPU device in multi-gpu setups |
| `version` | Shows current mangohud version |
-| `fps_limit` | Limit the apps framerate |
+| `fps_limit` | Limit the apps framerate. Comma-separated list of one or more FPS values. `0` means unlimited. |
+| `toggle_fps_limit` | Cycle between FPS limits. Defaults to `Shift_L+F1`. |
| `arch` | Show if the application is 32 or 64 bit |
| `histogram` | Change fps graph to histogram |
| `cpu_text`
`gpu_text` | Override CPU and GPU text |
diff --git a/bin/MangoHud.conf b/bin/MangoHud.conf
index dbc177f7..4eba14eb 100644
--- a/bin/MangoHud.conf
+++ b/bin/MangoHud.conf
@@ -5,7 +5,7 @@
################ PERFORMANCE #################
-### Limit the application FPS
+### Limit the application FPS. Comma-separated list of one or more FPS values (e.g. 0,30,60). 0 means unlimited (unless v-synced).
# fps_limit=
### VSYNC [0-3] 0 = adaptive; 1 = off; 2 = mailbox; 3 = on
@@ -122,6 +122,7 @@ background_alpha=0.5
### Change toggle keybinds for the hud & logging
#toggle_hud=Shift_R+F12
+#toggle_fps_limit=Shift_L+F1
#toggle_logging=Shift_L+F2
#reload_cfg=Shift_L+F4
#upload_log=Shift+F3
diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp
index 719937b7..b1967580 100644
--- a/src/overlay_params.cpp
+++ b/src/overlay_params.cpp
@@ -490,7 +490,7 @@ parse_overlay_config(struct overlay_params *params,
#ifdef HAVE_X11
params->toggle_hud = { XK_Shift_R, XK_F12 };
- params->toggle_fps_limit = { XK_Shift_L, XK_F3 };
+ params->toggle_fps_limit = { XK_Shift_L, XK_F1 };
params->toggle_logging = { XK_Shift_L, XK_F2 };
params->reload_cfg = { XK_Shift_L, XK_F4 };
params->upload_log = { XK_Shift_L, XK_F3 };
@@ -499,16 +499,19 @@ parse_overlay_config(struct overlay_params *params,
#ifdef _WIN32
params->toggle_hud = { VK_F12 };
+ params->toggle_fps_limit = { VK_F3 };
params->toggle_logging = { VK_F2 };
params->reload_cfg = { VK_F4 };
#undef parse_toggle_hud
+ #undef parse_toggle_fps_limit
#undef parse_toggle_logging
#undef parse_reload_cfg
- #define parse_toggle_hud(x) params->toggle_hud
- #define parse_toggle_logging(x) params->toggle_logging
- #define parse_reload_cfg(x) params->reload_cfg
+ #define parse_toggle_hud(x) params->toggle_hud
+ #define parse_toggle_fps_limit(x) params->toggle_fps_limit
+ #define parse_toggle_logging(x) params->toggle_logging
+ #define parse_reload_cfg(x) params->reload_cfg
#endif