diff --git a/src/gui/osd_helpers.cpp b/src/gui/osd_helpers.cpp
index 1550771..fd1f1aa 100644
--- a/src/gui/osd_helpers.cpp
+++ b/src/gui/osd_helpers.cpp
@@ -63,12 +63,10 @@ void COsdHelpers::changeOsdResolution(uint32_t mode, bool automode/*=false*/, bo

    if ((g_settings.video_Mode == VIDEO_STD_AUTO) &&
        (g_settings.enabled_auto_modes[videoSystem] == 1) &&
-       (!isVideoSystem1080(videoSystem)))
+       (!isVideoSystem1080(videoSystem)) &&
+       (!isVideoSystem2160(videoSystem)))
        modeNew = OSDMODE_720;

-// if (!isVideoSystem1080(videoSystem))
-//     modeNew = OSDMODE_720;
-
    idx = frameBuffer->getIndexOsdResolution(modeNew);
    resetOsd = (modeNew != getOsdResolution()) ? true : false;
 #if 1
@@ -148,11 +146,7 @@ int COsdHelpers::isVideoSystem1080(int res)
        (res == VIDEO_STD_1080P50) ||
        (res == VIDEO_STD_1080P60) ||
        (res == VIDEO_STD_1080P2397) ||
-       (res == VIDEO_STD_1080P2997) ||
-       (res == VIDEO_STD_2160P24) ||
-       (res == VIDEO_STD_2160P25) ||
-       (res == VIDEO_STD_2160P30) ||
-       (res == VIDEO_STD_2160P50))
+       (res == VIDEO_STD_1080P2997))
        return true;
 #if 0
    /* for testing only */
@@ -163,6 +157,17 @@ int COsdHelpers::isVideoSystem1080(int res)
    return false;
 }

+int COsdHelpers::isVideoSystem2160(int res)
+{
+   if ((res == VIDEO_STD_2160P24) ||
+       (res == VIDEO_STD_2160P25) ||
+       (res == VIDEO_STD_2160P30) ||
+       (res == VIDEO_STD_2160P50))
+       return true;
+
+   return false;
+}
+
 int COsdHelpers::getVideoSystem()
 {
    return videoDecoder->GetVideoSystem();
diff --git a/src/gui/osd_helpers.h b/src/gui/osd_helpers.h
index e86b1df..728bbf3 100644
--- a/src/gui/osd_helpers.h
+++ b/src/gui/osd_helpers.h
@@ -22,6 +22,7 @@ class COsdHelpers : public sigc::trackable

        void changeOsdResolution(uint32_t mode, bool automode=false, bool forceOsdReset=false);
        int  isVideoSystem1080(int res);
+       int  isVideoSystem2160(int res);
        int  getVideoSystem();
        uint32_t getOsdResolution();
        int setVideoSystem(int newSystem, bool remember = true);
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 9d8e223..87b5898 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -709,9 +709,8 @@ int COsdSetup::showOsdSetup()
        resCount = 1;
    }
    int videoSystem = COsdHelpers::getInstance()->getVideoSystem();
-   bool enable = ((resCount > 1) &&
-           COsdHelpers::getInstance()->isVideoSystem1080(videoSystem) &&
-           (g_settings.video_Mode != VIDEO_STD_AUTO));
+   bool enable = ((resCount > 1) && (g_settings.video_Mode != VIDEO_STD_AUTO) &&
+           (COsdHelpers::getInstance()->isVideoSystem1080(videoSystem) || COsdHelpers::getInstance()->isVideoSystem2160(videoSystem)));
    CMenuOptionChooser * osd_res = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_RESOLUTION, &g_settings.osd_resolution, kext, resCount, enable, this);
    osd_res->OnAfterChangeOption.connect(sigc::mem_fun(frameBuffer->getInstance(), &CFrameBuffer::clearIconCache));
    osd_res->setHint("", LOCALE_MENU_HINT_OSD_RESOLUTION);