diff --git a/app/Filament/Admin/Resources/FooterTemplates/Schemas/FooterTemplateForm.php b/app/Filament/Admin/Resources/FooterTemplates/Schemas/FooterTemplateForm.php
index e31d58e..20dd3f5 100644
--- a/app/Filament/Admin/Resources/FooterTemplates/Schemas/FooterTemplateForm.php
+++ b/app/Filament/Admin/Resources/FooterTemplates/Schemas/FooterTemplateForm.php
@@ -43,10 +43,13 @@ class FooterTemplateForm
 
                         // Preview Component - placed after editor
                         View::make('components.template-preview')
-                            ->viewData([
-                                'type' => 'footer',
-                                'fieldName' => 'html_content',
-                            ])
+                            ->viewData(function ($record) {
+                                return [
+                                    'type' => 'footer',
+                                    'fieldName' => 'html_content',
+                                    'recordId' => $record?->id,
+                                ];
+                            })
                             ->columnSpanFull(),
 
                         Toggle::make('is_active')
diff --git a/app/Filament/Admin/Resources/HeaderTemplates/Schemas/HeaderTemplateForm.php b/app/Filament/Admin/Resources/HeaderTemplates/Schemas/HeaderTemplateForm.php
index ec63639..c99aed3 100644
--- a/app/Filament/Admin/Resources/HeaderTemplates/Schemas/HeaderTemplateForm.php
+++ b/app/Filament/Admin/Resources/HeaderTemplates/Schemas/HeaderTemplateForm.php
@@ -42,10 +42,13 @@ class HeaderTemplateForm
 
                         // Preview Component - placed after editor
                         View::make('components.template-preview')
-                            ->viewData([
-                                'type' => 'header',
-                                'fieldName' => 'html_content',
-                            ])
+                            ->viewData(function ($record) {
+                                return [
+                                    'type' => 'header',
+                                    'fieldName' => 'html_content',
+                                    'recordId' => $record?->id,
+                                ];
+                            })
                             ->columnSpanFull(),
 
                         Toggle::make('is_active')
diff --git a/app/Filament/Admin/Resources/SectionTemplates/Schemas/SectionTemplateForm.php b/app/Filament/Admin/Resources/SectionTemplates/Schemas/SectionTemplateForm.php
index f700df0..2849380 100644
--- a/app/Filament/Admin/Resources/SectionTemplates/Schemas/SectionTemplateForm.php
+++ b/app/Filament/Admin/Resources/SectionTemplates/Schemas/SectionTemplateForm.php
@@ -42,10 +42,13 @@ class SectionTemplateForm
 
                         // Preview Component - placed after editor
                         View::make('components.template-preview')
-                            ->viewData([
-                                'type' => 'section',
-                                'fieldName' => 'html_content',
-                            ])
+                            ->viewData(function ($record) {
+                                return [
+                                    'type' => 'section',
+                                    'fieldName' => 'html_content',
+                                    'recordId' => $record?->id,
+                                ];
+                            })
                             ->columnSpanFull(),
 
                         Toggle::make('is_active')
diff --git a/resources/views/components/template-preview.blade.php b/resources/views/components/template-preview.blade.php
index e8014d4..98774ae 100644
--- a/resources/views/components/template-preview.blade.php
+++ b/resources/views/components/template-preview.blade.php
@@ -2,9 +2,10 @@
     $previewUrl = route('template.preview');
     $type = $type ?? 'section';
     $fieldName = $fieldName ?? 'html_content';
+    $recordId = $recordId ?? null;
 @endphp
 <div 
-    x-data="templatePreview(@js($previewUrl), @js($type), @js($fieldName))"
+    x-data="templatePreview(@js($previewUrl), @js($type), @js($fieldName), @js($recordId))"
     class="template-preview-wrapper w-full"
     style="width: 100%;"
     wire:ignore.self>
@@ -68,20 +69,52 @@
 
 @push('scripts')
 <script>
-function templatePreview(previewUrl, type, fieldName) {
+function templatePreview(previewUrl, type, fieldName, recordIdFromView = null) {
     return {
         previewUrl: previewUrl,
         type: type,
         fieldName: fieldName,
         iframeSrc: '',
         isLoading: false,
-        recordId: null,
+        recordId: recordIdFromView,
         
         init() {
-            // URL'den ID'yi al
-            const urlMatch = window.location.pathname.match(/\/(\d+)\/(edit|view)$/);
+            // Önce viewData'dan gelen ID'yi kullan
+            if (this.recordId) {
+                return;
+            }
+            
+            // Yoksa URL'den ID'yi al (çeşitli formatları dene)
+            let urlMatch = window.location.pathname.match(/\/(\d+)\/(edit|view)$/);
             if (urlMatch && urlMatch[1]) {
                 this.recordId = urlMatch[1];
+                return;
+            }
+            
+            // Alternatif format: /admin/resource/{id}/edit
+            urlMatch = window.location.pathname.match(/\/(\d+)\/edit$/);
+            if (urlMatch && urlMatch[1]) {
+                this.recordId = urlMatch[1];
+                return;
+            }
+            
+            // Alternatif format: /admin/resource/{id}
+            urlMatch = window.location.pathname.match(/\/(\d+)$/);
+            if (urlMatch && urlMatch[1]) {
+                this.recordId = urlMatch[1];
+                return;
+            }
+            
+            // Filament Livewire component'inden ID almayı dene
+            try {
+                const livewireComponent = window.Livewire?.find(
+                    document.querySelector('[wire\\:id]')?.getAttribute('wire:id')
+                );
+                if (livewireComponent?.mounted?.id) {
+                    this.recordId = livewireComponent.mounted.id;
+                }
+            } catch (e) {
+                console.log('[Preview] Could not get ID from Livewire');
             }
         },