diff --git a/src/modules/event/sdl/Event.cpp b/src/modules/event/sdl/Event.cpp
index c6ecdc6f7..b2e8288e4 100644
--- a/src/modules/event/sdl/Event.cpp
+++ b/src/modules/event/sdl/Event.cpp
@@ -644,6 +644,16 @@ std::map<SDL_Keycode, love::keyboard::Keyboard::Key> Event::createKeyMap()
 	k[SDLK_AUDIOPLAY] = Keyboard::KEY_AUDIOPLAY;
 	k[SDLK_AUDIOMUTE] = Keyboard::KEY_AUDIOMUTE;
 	k[SDLK_MEDIASELECT] = Keyboard::KEY_MEDIASELECT;
+	k[SDLK_WWW] = Keyboard::KEY_WWW;
+	k[SDLK_MAIL] = Keyboard::KEY_MAIL;
+	k[SDLK_CALCULATOR] = Keyboard::KEY_CALCULATOR;
+	k[SDLK_COMPUTER] = Keyboard::KEY_COMPUTER;
+	k[SDLK_AC_SEARCH] = Keyboard::KEY_APP_SEARCH;
+	k[SDLK_AC_HOME] = Keyboard::KEY_APP_HOME;
+	k[SDLK_AC_BACK] = Keyboard::KEY_APP_BACK;
+	k[SDLK_AC_FORWARD] = Keyboard::KEY_APP_FORWARD;
+	k[SDLK_AC_REFRESH] = Keyboard::KEY_APP_REFRESH;
+	k[SDLK_AC_BOOKMARKS] = Keyboard::KEY_APP_BOOKMARKS;
 
 	k[SDLK_BRIGHTNESSDOWN] = Keyboard::KEY_BRIGHTNESSDOWN;
 	k[SDLK_BRIGHTNESSUP] = Keyboard::KEY_BRIGHTNESSUP;
diff --git a/src/modules/keyboard/Keyboard.cpp b/src/modules/keyboard/Keyboard.cpp
index 6270c108f..10622b097 100644
--- a/src/modules/keyboard/Keyboard.cpp
+++ b/src/modules/keyboard/Keyboard.cpp
@@ -220,6 +220,16 @@ StringMap<Keyboard::Key, Keyboard::KEY_MAX_ENUM>::Entry Keyboard::keyEntries[] =
 	{"audioplay", Keyboard::KEY_AUDIOPLAY},
 	{"audiomute", Keyboard::KEY_AUDIOMUTE},
 	{"mediaselect", Keyboard::KEY_MEDIASELECT},
+	{"www", Keyboard::KEY_WWW},
+	{"mail", Keyboard::KEY_MAIL},
+	{"calculator", Keyboard::KEY_CALCULATOR},
+	{"computer", Keyboard::KEY_COMPUTER},
+	{"appsearch", Keyboard::KEY_APP_SEARCH},
+	{"apphome", Keyboard::KEY_APP_HOME},
+	{"appback", Keyboard::KEY_APP_BACK},
+	{"appforward", Keyboard::KEY_APP_FORWARD},
+	{"apprefresh", Keyboard::KEY_APP_REFRESH},
+	{"appbookmarks", Keyboard::KEY_APP_BOOKMARKS},
 
 	{"brightnessdown", Keyboard::KEY_BRIGHTNESSDOWN},
 	{"brightnessup", Keyboard::KEY_BRIGHTNESSUP},
diff --git a/src/modules/keyboard/Keyboard.h b/src/modules/keyboard/Keyboard.h
index 5e2e325a0..f53071197 100644
--- a/src/modules/keyboard/Keyboard.h
+++ b/src/modules/keyboard/Keyboard.h
@@ -220,6 +220,16 @@ public:
 		KEY_AUDIOPLAY,
 		KEY_AUDIOMUTE,
 		KEY_MEDIASELECT,
+		KEY_WWW,
+		KEY_MAIL,
+		KEY_CALCULATOR,
+		KEY_COMPUTER,
+		KEY_APP_SEARCH,
+		KEY_APP_HOME,
+		KEY_APP_BACK,
+		KEY_APP_FORWARD,
+		KEY_APP_REFRESH,
+		KEY_APP_BOOKMARKS,
 
 		KEY_BRIGHTNESSDOWN,
 		KEY_BRIGHTNESSUP,
diff --git a/src/modules/keyboard/sdl/Keyboard.cpp b/src/modules/keyboard/sdl/Keyboard.cpp
index 4c70ea94a..3c9bd6468 100644
--- a/src/modules/keyboard/sdl/Keyboard.cpp
+++ b/src/modules/keyboard/sdl/Keyboard.cpp
@@ -264,6 +264,16 @@ std::map<Keyboard::Key, SDL_Keycode> Keyboard::createKeyMap()
 	k[Keyboard::KEY_AUDIOPLAY] = SDLK_AUDIOPLAY;
 	k[Keyboard::KEY_AUDIOMUTE] = SDLK_AUDIOMUTE;
 	k[Keyboard::KEY_MEDIASELECT] = SDLK_MEDIASELECT;
+	k[Keyboard::KEY_WWW] = SDLK_WWW;
+	k[Keyboard::KEY_MAIL] = SDLK_MAIL;
+	k[Keyboard::KEY_CALCULATOR] = SDLK_CALCULATOR;
+	k[Keyboard::KEY_COMPUTER] = SDLK_COMPUTER;
+	k[Keyboard::KEY_APP_SEARCH] = SDLK_AC_SEARCH;
+	k[Keyboard::KEY_APP_HOME] = SDLK_AC_HOME;
+	k[Keyboard::KEY_APP_BACK] = SDLK_AC_BACK;
+	k[Keyboard::KEY_APP_FORWARD] = SDLK_AC_FORWARD;
+	k[Keyboard::KEY_APP_REFRESH] = SDLK_AC_REFRESH;
+	k[Keyboard::KEY_APP_BOOKMARKS] = SDLK_AC_BOOKMARKS;
 
 	k[Keyboard::KEY_BRIGHTNESSDOWN] = SDLK_BRIGHTNESSDOWN;
 	k[Keyboard::KEY_BRIGHTNESSUP] = SDLK_BRIGHTNESSUP;