diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h
index 31c95b0e13..55ef96b984 100644
--- a/firmware/target/hosted/sdl/sim-ui-defines.h
+++ b/firmware/target/hosted/sdl/sim-ui-defines.h
@@ -528,6 +528,13 @@
 #define UI_LCD_POSX                 26
 #define UI_LCD_POSY                 40
 
+#elif defined(EROS_Q)
+#define UI_TITLE                    "AIGO EROS Q"
+#define UI_WIDTH                    400 /* width of GUI window */
+#define UI_HEIGHT                   653 /* height of GUI window */
+#define UI_LCD_POSX                 45
+#define UI_LCD_POSY                 50
+
 #elif defined(SIMULATOR)
 #error no UI defines
 #endif
diff --git a/uisimulator/bitmaps/UI-aigoerosq.bmp b/uisimulator/bitmaps/UI-aigoerosq.bmp
new file mode 100644
index 0000000000..6fa83a7cd4
Binary files /dev/null and b/uisimulator/bitmaps/UI-aigoerosq.bmp differ
diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES
index f7f85c057c..dfcfe87b42 100644
--- a/uisimulator/buttonmap/SOURCES
+++ b/uisimulator/buttonmap/SOURCES
@@ -85,5 +85,7 @@ xduoo-x3ii.c
 xduoo-x20.c
 #elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD)
 ihifi2.c
+#elif CONFIG_KEYPAD == EROSQ_PAD
+erosq.c
 #endif
 #endif /* SIMULATOR */
diff --git a/uisimulator/buttonmap/erosq.c b/uisimulator/buttonmap/erosq.c
new file mode 100644
index 0000000000..3471b864ca
--- /dev/null
+++ b/uisimulator/buttonmap/erosq.c
@@ -0,0 +1,89 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ * Copyright (C) 2020 Solomon Peachy
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include <SDL.h>
+#include "button.h"
+#include "config.h"
+#include "buttonmap.h"
+
+int key_to_button(int keyboard_button)
+{
+    int new_btn = BUTTON_NONE;
+    switch (keyboard_button)
+    {
+        case SDLK_KP4:
+        case SDLK_LEFT:
+            new_btn = BUTTON_PREV;
+            break;
+        case SDLK_KP6:
+        case SDLK_RIGHT:
+            new_btn = BUTTON_NEXT;
+            break;
+        case SDLK_KP8:
+        case SDLK_UP:
+            new_btn = BUTTON_SCROLL_BACK;
+            break;
+        case SDLK_KP2:
+        case SDLK_DOWN:
+            new_btn = BUTTON_SCROLL_FWD;
+            break;
+        case SDLK_KP_ENTER:
+        case SDLK_RETURN:
+            new_btn = BUTTON_PLAY;
+            break;
+        case SDLK_ESCAPE:
+            new_btn = BUTTON_POWER;
+            break;
+        case SDLK_BACKSPACE:
+            new_btn = BUTTON_BACK;
+        case SDLK_KP_PERIOD:
+        case SDLK_INSERT:
+            new_btn = BUTTON_MENU;
+            break;
+        case SDL_BUTTON_WHEELUP:
+            new_btn = BUTTON_SCROLL_BACK;
+            break;
+        case SDL_BUTTON_WHEELDOWN:
+            new_btn = BUTTON_SCROLL_FWD;
+            break;
+        case SDLK_KP_MINUS:
+        case SDLK_PAGEUP:
+            new_btn = BUTTON_VOL_UP;
+            break;
+        case SDLK_KP_PLUS:
+        case SDLK_PAGEDOWN:
+            new_btn = BUTTON_VOL_DOWN;
+    }
+    return new_btn;
+}
+
+struct button_map bm[] = {
+    { SDLK_KP_PERIOD,   60, 599, 25, "Menu" },
+    { SDLK_KP8,        213, 473, 20, "Scroll Back" },
+    { SDLK_KP2,         50, 473, 20, "Scroll Fwd" },
+    { SDLK_KP4,        323, 384, 30, "Prev" },
+    { SDLK_KP6,        323, 465, 30, "Next" },
+    { SDLK_BACKSPACE,  323, 578, 25, "Back" },
+    { SDLK_KP_PLUS,    397,  91, 30, "Vol Up" },
+    { SDLK_KP_MINUS,   397, 185, 43, "Vol Dn" },
+    { SDLK_KP_ENTER,   134, 473, 40, "Play" },
+    { SDLK_ESCAPE,     338,  10, 25, "Power" },
+    { 0, 0, 0 , 0, "None" }
+};