diff --git a/src/main.tsx b/src/main.tsx
index 9ed8128..7687115 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -1,7 +1,6 @@
 // Load global styles
 import './index.css';
 // Load foundations
-import { DndContext } from '@dnd-kit/core';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { BrowserRouter, Route, Routes } from 'react-router-dom';
@@ -18,26 +17,24 @@ import Settings from './pages/Settings';
 
 ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
   <React.StrictMode>
-    <DndContext>
-      <Notifications>
-        <EstimWatchProvider>
-          <BrowserRouter>
-            <Routes>
-              <Route path="/" element={<Layout />}>
-                <Route index element={<Device />} />
-                <Route path="/play" element={<PlayControl />} />
-                <Route path="/library" element={<PatternLibrary />} />
-                <Route path="/pattern-editor">
-                  <Route index element={<PatternNavigator />} />
-                  <Route path="new" element={<CreatePattern />} />
-                  <Route path="edit" element={<PatternEditor />} />
-                </Route>
-                <Route path="/settings" element={<Settings />} />
+    <Notifications>
+      <EstimWatchProvider>
+        <BrowserRouter>
+          <Routes>
+            <Route path="/" element={<Layout />}>
+              <Route index element={<Device />} />
+              <Route path="/play" element={<PlayControl />} />
+              <Route path="/library" element={<PatternLibrary />} />
+              <Route path="/pattern-editor">
+                <Route index element={<PatternNavigator />} />
+                <Route path="new" element={<CreatePattern />} />
+                <Route path="edit" element={<PatternEditor />} />
               </Route>
-            </Routes>
-          </BrowserRouter>
-        </EstimWatchProvider>
-      </Notifications>
-    </DndContext>
+              <Route path="/settings" element={<Settings />} />
+            </Route>
+          </Routes>
+        </BrowserRouter>
+      </EstimWatchProvider>
+    </Notifications>
   </React.StrictMode>,
 );
diff --git a/src/page-components/pattern-editor/PulseList.tsx b/src/page-components/pattern-editor/PulseList.tsx
index 67698aa..51c7adb 100644
--- a/src/page-components/pattern-editor/PulseList.tsx
+++ b/src/page-components/pattern-editor/PulseList.tsx
@@ -1,3 +1,4 @@
+import { DndContext } from '@dnd-kit/core';
 import { Icon } from '@iconify/react/dist/iconify.js';
 import { useAtomValue } from 'jotai';
 import { FC } from 'react';
@@ -42,9 +43,11 @@ const PulseList: FC = () => {
       </div>
       <div className={styles.pulses}>
         <ScrollArea enableY>
-          <div className={styles.pulse_cards}>
-            {pulses.length === 0 && <div className="empty_prompt">No key pulses.</div>}
-          </div>
+          <DndContext>
+            <div className={styles.pulse_cards}>
+              {pulses.length === 0 && <div className="empty_prompt">No key pulses.</div>}
+            </div>
+          </DndContext>
         </ScrollArea>
       </div>
     </>