diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 38efc10cdf..8f9a3ea22d 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -2332,8 +2332,8 @@ void video_viewport_get_scaled_integer(struct video_viewport *vp,
       float aspect_ratio, bool keep_aspect,
       bool ydown)
 {
-   int padding_x                   = 0;
-   int padding_y                   = 0;
+   int x                           = 0;
+   int y                           = 0;
    settings_t *settings            = config_get_ptr();
    video_driver_state_t *video_st  = &video_driver_st;
    unsigned video_aspect_ratio_idx = settings->uints.video_aspect_ratio_idx;
@@ -2341,17 +2341,23 @@ void video_viewport_get_scaled_integer(struct video_viewport *vp,
    if (video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
    {
       struct video_viewport *custom_vp = &settings->video_viewport_custom;
-
       if (custom_vp)
       {
-         padding_x = width  - custom_vp->width;
-         padding_y = height - custom_vp->height;
+         x         = custom_vp->x;
+         y         = custom_vp->y;
+         if (!ydown)
+         {
+            y     += custom_vp->height;
+            y      = vp->height - y;
+         }
          width     = custom_vp->width;
          height    = custom_vp->height;
       }
    }
    else
    {
+      int padding_x         = 0;
+      int padding_y         = 0;
       float viewport_bias_x = settings->floats.video_viewport_bias_x;
       float viewport_bias_y = settings->floats.video_viewport_bias_y;
       unsigned base_width;
@@ -2372,10 +2378,10 @@ void video_viewport_get_scaled_integer(struct video_viewport *vp,
          viewport_bias_y = 1.0 - viewport_bias_y;
 
       if (rotation % 2)
-         base_height        = video_st->av_info.geometry.base_width;
+         base_height     = video_st->av_info.geometry.base_width;
 
       if (base_height == 0)
-         base_height        = 1;
+         base_height     = 1;
 
       /* Account for non-square pixels.
        * This is sort of contradictory with the goal of integer scale,
@@ -2413,14 +2419,14 @@ void video_viewport_get_scaled_integer(struct video_viewport *vp,
 
       width  -= padding_x;
       height -= padding_y;
-      padding_x *= viewport_bias_x;
-      padding_y *= viewport_bias_y;
+      x = padding_x * viewport_bias_x;
+      y = padding_y * viewport_bias_y;
    }
 
    vp->width  = width;
    vp->height = height;
-   vp->x      = padding_x;
-   vp->y      = padding_y;
+   vp->x      = x;
+   vp->y      = y;
 }
 
 void video_driver_display_type_set(enum rarch_display_type type)
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 0faeea183e..f8acb1bdbf 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -2605,7 +2605,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_X,
-   "Custom viewport offset used for defining the X-axis position of the viewport.\nThese are ignored if 'Integer Scale' is enabled."
+   "Custom viewport offset used for defining the X-axis position of the viewport."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
@@ -2613,7 +2613,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
-   "Custom viewport offset used for defining the Y-axis position of the viewport.\nThese are ignored if 'Integer Scale' is enabled."
+   "Custom viewport offset used for defining the Y-axis position of the viewport."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_X,
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 3aed5bdb08..5fcaca8f32 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -9832,17 +9832,14 @@ unsigned menu_displaylist_build_list(
                         count++;
                      break;
                   case ASPECT_RATIO_CUSTOM:
-                     if (!settings->bools.video_scale_integer)
-                     {
-                        if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
-                                 MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_X,
-                                 PARSE_ONLY_INT, false) == 0)
-                           count++;
-                        if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
-                                 MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_Y,
-                                 PARSE_ONLY_INT, false) == 0)
-                           count++;
-                     }
+                     if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
+                              MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_X,
+                              PARSE_ONLY_INT, false) == 0)
+                        count++;
+                     if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
+                              MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_Y,
+                              PARSE_ONLY_INT, false) == 0)
+                        count++;
                      if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
                               MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH,
                               PARSE_ONLY_UINT, false) == 0)