diff --git a/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer.tsx b/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer.tsx
index b9a54b97b..af3e3a911 100644
--- a/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer.tsx
+++ b/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer.tsx
@@ -217,6 +217,10 @@ const VisualizerInner = () => {
         }
     }, [motion, options]);
 
+    return <div className={styles.visualizer} ref={canvasRef} />;
+};
+
+export const Visualizer = () => {
     return (
         <div className={styles.container}>
             <ActionIcon
@@ -229,15 +233,9 @@ const VisualizerInner = () => {
                 top={0}
                 variant="transparent"
             />
-            <div className={styles.visualizer} ref={canvasRef} />
+            <ComponentErrorBoundary>
+                <VisualizerInner />
+            </ComponentErrorBoundary>
         </div>
     );
 };
-
-export const Visualizer = () => {
-    return (
-        <ComponentErrorBoundary>
-            <VisualizerInner />
-        </ComponentErrorBoundary>
-    );
-};
diff --git a/src/renderer/features/visualizer/components/butternchurn/visualizer.tsx b/src/renderer/features/visualizer/components/butternchurn/visualizer.tsx
index c0d505b2c..e1c0ef346 100644
--- a/src/renderer/features/visualizer/components/butternchurn/visualizer.tsx
+++ b/src/renderer/features/visualizer/components/butternchurn/visualizer.tsx
@@ -294,16 +294,6 @@ const VisualizerInner = () => {
 
     return (
         <div className={styles.container} ref={containerRef}>
-            <ActionIcon
-                className={styles.settingsIcon}
-                icon="settings2"
-                iconProps={{ size: 'lg' }}
-                onClick={openVisualizerSettingsModal}
-                pos="absolute"
-                right={0}
-                top={0}
-                variant="transparent"
-            />
             <canvas className={styles.canvas} ref={canvasRef} />
             {butterchurnSettings.currentPreset && (
                 <Text className={styles['preset-overlay']} isNoSelect size="sm">
@@ -316,8 +306,20 @@ const VisualizerInner = () => {
 
 export const Visualizer = () => {
     return (
-        <ComponentErrorBoundary>
-            <VisualizerInner />
-        </ComponentErrorBoundary>
+        <div className={styles.container} style={{ position: 'relative' }}>
+            <ActionIcon
+                className={styles.settingsIcon}
+                icon="settings2"
+                iconProps={{ size: 'lg' }}
+                onClick={openVisualizerSettingsModal}
+                pos="absolute"
+                right={0}
+                top={0}
+                variant="transparent"
+            />
+            <ComponentErrorBoundary>
+                <VisualizerInner />
+            </ComponentErrorBoundary>
+        </div>
     );
 };