diff --git a/website/client/src/pages/settings/components/genericSettingMixin.js b/website/client/src/pages/settings/components/genericUserPreferencesMixin.js
similarity index 90%
rename from website/client/src/pages/settings/components/genericSettingMixin.js
rename to website/client/src/pages/settings/components/genericUserPreferencesMixin.js
index ec57ef6e30..c64678487a 100644
--- a/website/client/src/pages/settings/components/genericSettingMixin.js
+++ b/website/client/src/pages/settings/components/genericUserPreferencesMixin.js
@@ -1,4 +1,4 @@
-export const GenericSettingMixin = {
+export const GenericUserPreferencesMixin = {
   methods: {
     setUserPreference (preferenceType, subtype) {
       const settings = {};
diff --git a/website/client/src/pages/settings/components/inlineSettingMixin.js b/website/client/src/pages/settings/components/inlineSettingMixin.js
index cb62aaab62..4886b9314a 100644
--- a/website/client/src/pages/settings/components/inlineSettingMixin.js
+++ b/website/client/src/pages/settings/components/inlineSettingMixin.js
@@ -44,6 +44,10 @@ export const InlineSettingMixin = {
     _openIt () {
       this.sharedState.markAsOpened(this);
       this.modalVisible = true;
+
+      this.$el.scrollTo({
+        behavior: 'smooth',
+      });
     },
     _hidePrevious () {
       this.sharedState.instanceOfCurrentlyOpened.resetControls();
diff --git a/website/client/src/pages/settings/inlineSettings/audioThemeSetting.vue b/website/client/src/pages/settings/inlineSettings/audioThemeSetting.vue
index d6684d3510..16d6a18e0d 100644
--- a/website/client/src/pages/settings/inlineSettings/audioThemeSetting.vue
+++ b/website/client/src/pages/settings/inlineSettings/audioThemeSetting.vue
@@ -121,13 +121,13 @@ import { mapState } from '@/libs/store';
 import SaveCancelButtons from '../components/saveCancelButtons.vue';
 import { InlineSettingMixin } from '../components/inlineSettingMixin';
 import SelectList from '@/components/ui/selectList';
-import { GenericSettingMixin } from '../components/genericSettingMixin';
+import { GenericUserPreferencesMixin } from '../components/genericUserPreferencesMixin';
 import sounds from '@/libs/sounds';
 import ToggleSwitch from '@/components/ui/toggleSwitch.vue';
 
 export default {
   components: { ToggleSwitch, SelectList, SaveCancelButtons },
-  mixins: [InlineSettingMixin, GenericSettingMixin],
+  mixins: [InlineSettingMixin, GenericUserPreferencesMixin],
   data () {
     return {
       soundIndex: 0,
diff --git a/website/client/src/pages/settings/inlineSettings/dateFormatSetting.vue b/website/client/src/pages/settings/inlineSettings/dateFormatSetting.vue
index 3d085510b0..cde6b7186b 100644
--- a/website/client/src/pages/settings/inlineSettings/dateFormatSetting.vue
+++ b/website/client/src/pages/settings/inlineSettings/dateFormatSetting.vue
@@ -77,11 +77,11 @@ import { mapState } from '@/libs/store';
 import SaveCancelButtons from '../components/saveCancelButtons.vue';
 import { InlineSettingMixin } from '../components/inlineSettingMixin';
 import SelectList from '@/components/ui/selectList';
-import { GenericSettingMixin } from '../components/genericSettingMixin';
+import { GenericUserPreferencesMixin } from '../components/genericUserPreferencesMixin';
 
 export default {
   components: { SelectList, SaveCancelButtons },
-  mixins: [InlineSettingMixin, GenericSettingMixin],
+  mixins: [InlineSettingMixin, GenericUserPreferencesMixin],
   data () {
     return {
       selectedFormat: '',
diff --git a/website/client/src/pages/settings/inlineSettings/headerSettings.vue b/website/client/src/pages/settings/inlineSettings/headerSettings.vue
index 4c5f945b6d..e2238182cc 100644
--- a/website/client/src/pages/settings/inlineSettings/headerSettings.vue
+++ b/website/client/src/pages/settings/inlineSettings/headerSettings.vue
@@ -44,12 +44,12 @@ import { mapState } from '@/libs/store';
 
 import { InlineSettingMixin } from '../components/inlineSettingMixin';
 import ToggleSwitch from '@/components/ui/toggleSwitch.vue';
-import { GenericSettingMixin } from '../components/genericSettingMixin';
+import { GenericUserPreferencesMixin } from '../components/genericUserPreferencesMixin';
 
 
 export default {
   components: { ToggleSwitch },
-  mixins: [InlineSettingMixin, GenericSettingMixin],
+  mixins: [InlineSettingMixin, GenericUserPreferencesMixin],
   computed: {
     ...mapState({
       user: 'user.data',
diff --git a/website/client/src/pages/settings/inlineSettings/languageSetting.vue b/website/client/src/pages/settings/inlineSettings/languageSetting.vue
index fcc69dc9c8..e3d3fbda0d 100644
--- a/website/client/src/pages/settings/inlineSettings/languageSetting.vue
+++ b/website/client/src/pages/settings/inlineSettings/languageSetting.vue
@@ -89,11 +89,11 @@ import { mapState } from '@/libs/store';
 import SaveCancelButtons from '../components/saveCancelButtons.vue';
 import { InlineSettingMixin } from '../components/inlineSettingMixin';
 import SelectList from '@/components/ui/selectList';
-import { GenericSettingMixin } from '../components/genericSettingMixin';
+import { GenericUserPreferencesMixin } from '../components/genericUserPreferencesMixin';
 
 export default {
   components: { SelectList, SaveCancelButtons },
-  mixins: [InlineSettingMixin, GenericSettingMixin],
+  mixins: [InlineSettingMixin, GenericUserPreferencesMixin],
   data () {
     return {
       selectedLanguage: '',