diff --git a/setting_list.h b/setting_list.h
index 54706feea6..ea09d1044d 100644
--- a/setting_list.h
+++ b/setting_list.h
@@ -183,8 +183,6 @@ struct rarch_setting
       bool           boolean;
    } original_value;
 
-   uint32_t             flags;
-   uint32_t             free_flags;
    uint32_t             index_offset;
    uint32_t             size;
    unsigned             bind_type;
@@ -197,7 +195,10 @@ struct rarch_setting
    enum msg_hash_enums  enum_value_idx;
    enum setting_type    type;
 
+   uint16_t             flags;
+
    int16_t              offset_by;
+   uint8_t              free_flags;
    uint8_t              index;
 };