diff --git a/src/main/cms/cms.c b/src/main/cms/cms.c
index a90fa6fb59..402be79e1a 100644
--- a/src/main/cms/cms.c
+++ b/src/main/cms/cms.c
@@ -725,6 +725,13 @@ void cmsMenuOpen(void)
       maxMenuItems      = pCurrentDisplay->rows - 2;
     }
 
+    if (pCurrentDisplay->useFullscreen)
+    {
+    	leftMenuColumn = 0;
+    	rightMenuColumn   = pCurrentDisplay->cols;
+    	maxMenuItems      = pCurrentDisplay->rows;
+    }
+
     cmsMenuChange(pCurrentDisplay, currentCtx.menu);
 }
 
diff --git a/src/main/drivers/display.c b/src/main/drivers/display.c
index f24b8dc3fd..812897cb8a 100644
--- a/src/main/drivers/display.c
+++ b/src/main/drivers/display.c
@@ -119,6 +119,7 @@ void displayInit(displayPort_t *instance, const displayPortVTable_t *vTable)
 {
     instance->vTable = vTable;
     instance->vTable->clearScreen(instance);
+    instance->useFullscreen = false;
     instance->cleared = true;
     instance->grabCount = 0;
     instance->cursorRow = -1;
diff --git a/src/main/drivers/display.h b/src/main/drivers/display.h
index bbe9ad3463..79d428fe3b 100644
--- a/src/main/drivers/display.h
+++ b/src/main/drivers/display.h
@@ -31,6 +31,7 @@ typedef struct displayPort_s {
     uint8_t posY;
 
     // CMS state
+    bool useFullscreen;
     bool cleared;
     int8_t cursorRow;
     int8_t grabCount;
diff --git a/src/main/io/displayport_hott.c b/src/main/io/displayport_hott.c
index 21078ad0cb..96ac13276c 100644
--- a/src/main/io/displayport_hott.c
+++ b/src/main/io/displayport_hott.c
@@ -22,12 +22,6 @@
 #include "platform.h"
 #if defined (USE_HOTT_TEXTMODE) && defined (USE_CMS)
 
-// Fixme:
-// Let the CMS believe we have a bigger display to avoid empty rows and columns
-// Better make this configurable in CMS
-#define ROW_CORRECTION 1
-#define COL_CORRECTION 2
-
 #include "common/utils.h"
 #include "cms/cms.h"
 #include "telemetry/hott.h"
@@ -49,13 +43,6 @@ static int hottWriteChar(displayPort_t *displayPort, uint8_t col, uint8_t row, u
 {
     UNUSED(displayPort);
 
-    if (row < ROW_CORRECTION || row >= HOTT_TEXTMODE_DISPLAY_ROWS + ROW_CORRECTION
-        || col < COL_CORRECTION || col >= HOTT_TEXTMODE_DISPLAY_COLUMNS + COL_CORRECTION) {
-       return 0;
-    }
-    row -= ROW_CORRECTION;
-    col -= COL_CORRECTION;
-
     hottTextmodeWriteChar(col, row, c);
     return 0;
 }
@@ -136,8 +123,9 @@ displayPort_t *displayPortHottInit()
 {
     hottDisplayPort.device = NULL;
     displayInit(&hottDisplayPort, &hottVTable);
-    hottDisplayPort.rows = HOTT_TEXTMODE_DISPLAY_ROWS + ROW_CORRECTION * 2;
-    hottDisplayPort.cols = HOTT_TEXTMODE_DISPLAY_COLUMNS + COL_CORRECTION * 2;
+    hottDisplayPort.useFullscreen = true;
+    hottDisplayPort.rows = HOTT_TEXTMODE_DISPLAY_ROWS;
+    hottDisplayPort.cols = HOTT_TEXTMODE_DISPLAY_COLUMNS;
     return &hottDisplayPort;
 }