diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 00a429552..5b4a94348 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -682,6 +682,8 @@
         "exportImportSettings_offendingKeyError": "\"{{offendingKey}}\" is incorrect - {{reason}}",
         "externalLinks_description": "enables showing external links (Last.fm, MusicBrainz) on artist/album pages",
         "externalLinks": "show external links",
+        "followCurrentSong_description": "automatically scroll the play queue to the current playing song",
+        "followCurrentSong": "follow current song",
         "followLyric_description": "scroll the lyric to the current playing position",
         "followLyric": "follow current lyric",
         "font_description": "sets the font to use for the application",
@@ -779,7 +781,8 @@
         "playerAlbumArtResolution": "player album art resolution",
         "playerbarOpenDrawer_description": "allows clicking of the playerbar to open the full screen player",
         "playerbarOpenDrawer": "playerbar fullscreen toggle",
-        "playerbarSlider": "playerbar slider - the waveform is not recommended if using on a slow or metered internet connection",
+        "playerbarSlider": "playerbar slider",
+        "playerbarSlider_description": "the waveform is not recommended if on a slow or metered internet connection",
         "playerbarSliderType_optionSlider": "slider",
         "playerbarSliderType_optionWaveform": "waveform",
         "playerbarWaveformAlign": "waveform align",
diff --git a/src/renderer/features/now-playing/components/play-queue.tsx b/src/renderer/features/now-playing/components/play-queue.tsx
index 4ecda0495..5ddb73809 100644
--- a/src/renderer/features/now-playing/components/play-queue.tsx
+++ b/src/renderer/features/now-playing/components/play-queue.tsx
@@ -21,6 +21,7 @@ import {
     usePlayerActions,
     usePlayerQueueType,
     usePlayerSong,
+    useSettingsStore,
 } from '/@/renderer/store';
 import { Flex } from '/@/shared/components/flex/flex';
 import { LoadingOverlay } from '/@/shared/components/loading-overlay/loading-overlay';
@@ -46,6 +47,7 @@ export const PlayQueue = forwardRef<ItemListHandle, QueueProps>(({ listKey, sear
     const mergedRef = useMergedRef(ref, tableRef);
     const { getQueue } = usePlayerActions();
     const queueType = usePlayerQueueType();
+    const followCurrentSong = useSettingsStore((state) => state.general.followCurrentSong);
 
     const [debouncedSearchTerm] = useDebouncedValue(searchTerm, 200);
 
@@ -91,10 +93,10 @@ export const PlayQueue = forwardRef<ItemListHandle, QueueProps>(({ listKey, sear
         });
 
         const unsubCurrentTrack = subscribeCurrentTrack((e) => {
-            if (e.index !== -1) {
+            if (followCurrentSong && e.index !== -1) {
                 tableRef.current?.scrollToIndex(e.index, {
-                    align: 'top',
-                    behavior: 'smooth',
+                    align: 'center',
+                    behavior: 'auto',
                 });
             }
         });
@@ -105,7 +107,7 @@ export const PlayQueue = forwardRef<ItemListHandle, QueueProps>(({ listKey, sear
             unsub();
             unsubCurrentTrack();
         };
-    }, [getQueue, queueType, tableRef]);
+    }, [getQueue, queueType, tableRef, followCurrentSong]);
 
     const filteredData: QueueSong[] = useMemo(() => {
         if (debouncedSearchTerm) {
@@ -127,6 +129,7 @@ export const PlayQueue = forwardRef<ItemListHandle, QueueProps>(({ listKey, sear
     });
 
     const currentSong = usePlayerSong();
+
     const currentSongUniqueId = currentSong?._uniqueId;
 
     const { focused, ref: containerFocusRef } = useFocusWithin();
diff --git a/src/renderer/features/settings/components/general/control-settings.tsx b/src/renderer/features/settings/components/general/control-settings.tsx
index ea9d4d0ff..b08138b6c 100644
--- a/src/renderer/features/settings/components/general/control-settings.tsx
+++ b/src/renderer/features/settings/components/general/control-settings.tsx
@@ -185,6 +185,28 @@ export const ControlSettings = () => {
             isHidden: false,
             title: t('setting.playButtonBehavior', { postProcess: 'sentenceCase' }),
         },
+        {
+            control: (
+                <Switch
+                    aria-label="Follow current song"
+                    defaultChecked={settings.followCurrentSong}
+                    onChange={(e) =>
+                        setSettings({
+                            general: {
+                                ...settings,
+                                followCurrentSong: e.currentTarget.checked,
+                            },
+                        })
+                    }
+                />
+            ),
+            description: t('setting.followCurrentSong', {
+                context: 'description',
+                postProcess: 'sentenceCase',
+            }),
+            isHidden: false,
+            title: t('setting.followCurrentSong', { postProcess: 'sentenceCase' }),
+        },
         {
             control: (
                 <Slider
diff --git a/src/renderer/store/settings.store.ts b/src/renderer/store/settings.store.ts
index e4a209ec9..db2d257cd 100644
--- a/src/renderer/store/settings.store.ts
+++ b/src/renderer/store/settings.store.ts
@@ -230,6 +230,7 @@ const GeneralSettingsSchema = z.object({
     buttonSize: z.number(),
     disabledContextMenu: z.record(z.string(), z.boolean()),
     externalLinks: z.boolean(),
+    followCurrentSong: z.boolean(),
     followSystemTheme: z.boolean(),
     genreTarget: GenreTargetSchema,
     homeFeature: z.boolean(),
@@ -634,6 +635,7 @@ const initialState: SettingsState = {
         buttonSize: 15,
         disabledContextMenu: {},
         externalLinks: true,
+        followCurrentSong: true,
         followSystemTheme: false,
         genreTarget: GenreTarget.TRACK,
         homeFeature: true,