diff --git a/src/app/game/setup/editor/page.tsx b/src/app/game/setup/editor/page.tsx
index a3f40cd9..93ca0f46 100644
--- a/src/app/game/setup/editor/page.tsx
+++ b/src/app/game/setup/editor/page.tsx
@@ -4,12 +4,23 @@ import { Suspense, useState, useEffect, useCallback, useRef } from 'react';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { EditorCore, VOIDSTRIKE_EDITOR_CONFIG } from '@/editor';
 import { voidstrikeDataProvider } from '@/editor/providers/voidstrike';
-import { useGameSetupStore, loadEditorMapDataFromStorage } from '@/store/gameSetupStore';
+import { useGameSetupStore, loadEditorMapDataFromStorage, type GameSetupState } from '@/store/gameSetupStore';
 import { debugInitialization } from '@/utils/debugLogger';
 import type { EditorMapData } from '@/editor';
 import type { MapListItem } from '@/editor/core/EditorHeader';
 import type { MapData } from '@/data/maps/MapTypes';
 
+// Battle simulator launch helper
+const useBattleSimulator = () => {
+  const router = useRouter();
+  const startBattleSimulator = useGameSetupStore((state: GameSetupState) => state.startBattleSimulator);
+
+  return useCallback(() => {
+    startBattleSimulator();
+    router.push('/game');
+  }, [startBattleSimulator, router]);
+};
+
 /**
  * Map Editor Page
  *
@@ -27,6 +38,9 @@ function EditorPageContent() {
   const isNewMap = searchParams.get('new') === 'true';
   const mapIdParam = searchParams.get('map');
 
+  // Battle simulator
+  const handleBattleSimulator = useBattleSimulator();
+
   // State for map selection
   const [mapList, setMapList] = useState<MapListItem[]>([]);
   const [currentMapId, setCurrentMapId] = useState<string | undefined>(
@@ -154,6 +168,7 @@ function EditorPageContent() {
       mapList={mapList}
       onLoadMap={handleLoadMap}
       onNewMap={handleNewMap}
+      onBattleSimulator={handleBattleSimulator}
     />
   );
 }
diff --git a/src/editor/core/EditorCore.tsx b/src/editor/core/EditorCore.tsx
index ba36f374..05a39c41 100644
--- a/src/editor/core/EditorCore.tsx
+++ b/src/editor/core/EditorCore.tsx
@@ -67,6 +67,7 @@ export interface EditorCoreProps extends EditorCallbacks {
   mapList?: MapListItem[];
   onLoadMap?: (mapId: string) => void;
   onNewMap?: () => void;
+  onBattleSimulator?: () => void;
 }
 
 // ============================================
@@ -87,6 +88,7 @@ export function EditorCore({
   mapList,
   onLoadMap,
   onNewMap,
+  onBattleSimulator,
 }: EditorCoreProps) {
   const editorState = useEditorState(config);
   const { state, loadMap } = editorState;
@@ -625,6 +627,7 @@ export function EditorCore({
         currentMapId={mapId}
         onLoadMap={onLoadMap}
         onNewMap={onNewMap}
+        onBattleSimulator={onBattleSimulator}
       />
 
       {/* Main content */}
diff --git a/src/editor/core/EditorHeader.tsx b/src/editor/core/EditorHeader.tsx
index cc660d0d..910463dc 100644
--- a/src/editor/core/EditorHeader.tsx
+++ b/src/editor/core/EditorHeader.tsx
@@ -4,7 +4,7 @@
 
 'use client';
 
-import { useRef, useState } from 'react';
+import { useRef, useState, useMemo } from 'react';
 import type { EditorConfig, EditorMapData } from '../config/EditorConfig';
 
 export interface MapListItem {
@@ -34,6 +34,8 @@ export interface EditorHeaderProps {
   currentMapId?: string;
   onLoadMap?: (mapId: string) => void;
   onNewMap?: () => void;
+  // Battle Simulator
+  onBattleSimulator?: () => void;
 }
 
 export function EditorHeader({
@@ -56,12 +58,22 @@ export function EditorHeader({
   currentMapId,
   onLoadMap,
   onNewMap,
+  onBattleSimulator,
 }: EditorHeaderProps) {
   const fileInputRef = useRef<HTMLInputElement>(null);
   const [showLoadDropdown, setShowLoadDropdown] = useState(false);
+  const [mapSearch, setMapSearch] = useState('');
 
   const hasLoadMapFeature = mapList && onLoadMap && onNewMap;
 
+  // Filter maps based on search
+  const filteredMaps = useMemo(() => {
+    if (!mapList) return [];
+    if (!mapSearch.trim()) return mapList;
+    const searchLower = mapSearch.toLowerCase();
+    return mapList.filter(map => map.name.toLowerCase().includes(searchLower));
+  }, [mapList, mapSearch]);
+
   // Handle file import
   const handleFileSelect = (e: React.ChangeEvent<HTMLInputElement>) => {
     const file = e.target.files?.[0];
@@ -182,22 +194,59 @@ export function EditorHeader({
                 {/* Click outside to close */}
                 <div
                   className="fixed inset-0 z-40"
-                  onClick={() => setShowLoadDropdown(false)}
+                  onClick={() => {
+                    setShowLoadDropdown(false);
+                    setMapSearch('');
+                  }}
                 />
                 <div
-                  className="absolute top-full right-0 mt-1 w-56 max-h-72 overflow-y-auto rounded-lg shadow-xl z-50"
+                  className="absolute top-full right-0 mt-1 w-64 rounded-lg shadow-xl z-50 flex flex-col"
                   style={{
                     backgroundColor: 'var(--editor-bg)',
                     border: '1px solid var(--editor-border)',
+                    maxHeight: '400px',
                   }}
                 >
+                  {/* Search input */}
+                  <div
+                    className="p-2 flex-shrink-0"
+                    style={{ borderBottom: '1px solid var(--editor-border)' }}
+                  >
+                    <div className="relative">
+                      <svg
+                        className="absolute left-2.5 top-1/2 -translate-y-1/2 w-4 h-4"
+                        fill="none"
+                        stroke="currentColor"
+                        viewBox="0 0 24 24"
+                        style={{ color: 'var(--editor-text-muted)' }}
+                      >
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+                      </svg>
+                      <input
+                        type="text"
+                        placeholder="Search maps..."
+                        value={mapSearch}
+                        onChange={(e) => setMapSearch(e.target.value)}
+                        className="w-full pl-8 pr-3 py-1.5 text-sm rounded outline-none"
+                        style={{
+                          backgroundColor: 'var(--editor-surface)',
+                          color: 'var(--editor-text)',
+                          border: '1px solid var(--editor-border)',
+                        }}
+                        autoFocus
+                        onClick={(e) => e.stopPropagation()}
+                      />
+                    </div>
+                  </div>
+
                   {/* New Map option */}
                   <button
                     onClick={() => {
                       onNewMap();
                       setShowLoadDropdown(false);
+                      setMapSearch('');
                     }}
-                    className="w-full px-3 py-2 text-left text-sm flex items-center gap-2 transition-colors hover:opacity-80"
+                    className="w-full px-3 py-2 text-left text-sm flex items-center gap-2 transition-colors hover:opacity-80 flex-shrink-0"
                     style={{
                       color: 'var(--editor-text)',
                       borderBottom: '1px solid var(--editor-border)',
@@ -209,34 +258,47 @@ export function EditorHeader({
                     New Blank Map
                   </button>
 
-                  {/* Existing maps */}
-                  <div className="py-1">
+                  {/* Scrollable maps list */}
+                  <div className="flex-1 overflow-y-auto min-h-0">
                     <div
-                      className="px-3 py-1 text-xs uppercase tracking-wider"
-                      style={{ color: 'var(--editor-text-muted)' }}
+                      className="px-3 py-1.5 text-xs uppercase tracking-wider sticky top-0"
+                      style={{
+                        color: 'var(--editor-text-muted)',
+                        backgroundColor: 'var(--editor-bg)',
+                      }}
                     >
-                      Existing Maps
+                      {mapSearch.trim() ? `Results (${filteredMaps.length})` : 'Existing Maps'}
                     </div>
-                    {mapList.map((map: MapListItem) => (
-                      <button
-                        key={map.id}
-                        onClick={() => {
-                          onLoadMap(map.id);
-                          setShowLoadDropdown(false);
-                        }}
-                        className="w-full px-3 py-2 text-left text-sm flex items-center gap-2 transition-colors hover:opacity-80"
-                        style={{
-                          backgroundColor: currentMapId === map.id ? 'var(--editor-selection)' : 'transparent',
-                          color: currentMapId === map.id ? 'var(--editor-text)' : 'var(--editor-text-secondary)',
-                        }}
+                    {filteredMaps.length === 0 ? (
+                      <div
+                        className="px-3 py-4 text-sm text-center"
+                        style={{ color: 'var(--editor-text-muted)' }}
                       >
-                        <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24" style={{ color: 'var(--editor-text-muted)' }}>
-                          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2}
-                            d="M9 20l-5.447-2.724A1 1 0 013 16.382V5.618a1 1 0 011.447-.894L9 7m0 13l6-3m-6 3V7m6 10l4.553 2.276A1 1 0 0021 18.382V7.618a1 1 0 00-.553-.894L15 4m0 13V4m0 0L9 7" />
-                        </svg>
-                        {map.name}
-                      </button>
-                    ))}
+                        No maps found
+                      </div>
+                    ) : (
+                      filteredMaps.map((map: MapListItem) => (
+                        <button
+                          key={map.id}
+                          onClick={() => {
+                            onLoadMap(map.id);
+                            setShowLoadDropdown(false);
+                            setMapSearch('');
+                          }}
+                          className="w-full px-3 py-2 text-left text-sm flex items-center gap-2 transition-colors hover:opacity-80"
+                          style={{
+                            backgroundColor: currentMapId === map.id ? 'var(--editor-selection)' : 'transparent',
+                            color: currentMapId === map.id ? 'var(--editor-text)' : 'var(--editor-text-secondary)',
+                          }}
+                        >
+                          <svg className="w-4 h-4 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24" style={{ color: 'var(--editor-text-muted)' }}>
+                            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2}
+                              d="M9 20l-5.447-2.724A1 1 0 013 16.382V5.618a1 1 0 011.447-.894L9 7m0 13l6-3m-6 3V7m6 10l4.553 2.276A1 1 0 0021 18.382V7.618a1 1 0 00-.553-.894L15 4m0 13V4m0 0L9 7" />
+                          </svg>
+                          <span className="truncate">{map.name}</span>
+                        </button>
+                      ))
+                    )}
                   </div>
                 </div>
               </>
@@ -328,6 +390,21 @@ export function EditorHeader({
           Cancel
         </button>
 
+        {/* Battle Simulator button */}
+        {onBattleSimulator && (
+          <button
+            onClick={onBattleSimulator}
+            className="px-3 py-1.5 text-sm font-medium rounded transition-colors hover:opacity-90"
+            style={{
+              backgroundColor: 'var(--editor-warning)',
+              color: 'var(--editor-bg)',
+            }}
+            title="Launch Battle Simulator sandbox"
+          >
+            Battle Sim
+          </button>
+        )}
+
         {/* Preview button */}
         {onPreview && (
           <button