diff --git a/app/Filament/Server/Resources/FileResource/Pages/EditFiles.php b/app/Filament/Server/Resources/FileResource/Pages/EditFiles.php
index a35297280..79234a32f 100644
--- a/app/Filament/Server/Resources/FileResource/Pages/EditFiles.php
+++ b/app/Filament/Server/Resources/FileResource/Pages/EditFiles.php
@@ -118,16 +118,14 @@ class EditFiles extends Page
                             ->icon('tabler-x')
                             ->url(fn () => ListFiles::getUrl(['path' => dirname($this->path)])),
                     ])
-                    ->footerActionsAlignment(Alignment::End)
+                    ->footerActionsAlignment(Alignment::End) //TODO MISSING PADDING
                     ->schema([
-                        Select::make('lang')
+                        Select::make('lang') //TODO BROKEN
                             ->label('Syntax Highlighting')
                             ->searchable()
-                            ->native(false)
                             ->live()
                             ->options(EditorLanguages::class)
                             ->selectablePlaceholder(false)
-                            ->afterStateUpdated(fn ($state) => $this->dispatch('setLanguage', lang: $state))
                             ->default(fn () => EditorLanguages::fromWithAlias(pathinfo($this->path, PATHINFO_EXTENSION))),
                         CodeEditor::make('editor')
                             ->hiddenLabel()
@@ -165,7 +163,8 @@ class EditFiles extends Page
                                     $this->redirect(ListFiles::getUrl(['path' => dirname($this->path)]));
                                 }
                             }),
-                    ]),
+                    ])
+                    ->columnSpanFull(),
             ]);
     }
 
@@ -208,7 +207,7 @@ class EditFiles extends Page
     {
         return [
             'form' => $this->form(static::getResource()::form(
-                $this->makeForm()
+                $this->makeSchema()
                     ->statePath($this->getFormStatePath())
                     ->columns($this->hasInlineLabels() ? 1 : 2)
                     ->inlineLabel($this->hasInlineLabels()),
diff --git a/resources/views/filament/server/pages/edit-file.blade.php b/resources/views/filament/server/pages/edit-file.blade.php
index 28fdf858f..2f01af56a 100644
--- a/resources/views/filament/server/pages/edit-file.blade.php
+++ b/resources/views/filament/server/pages/edit-file.blade.php
@@ -1,9 +1,6 @@
 <x-filament-panels::page class="fi-resource-edit-file-page">
-    <x-filament-panels::form
-        id="form"
-        :wire:key="$this->getId() . '.forms.' . $this->getFormStatePath()"
-        wire:submit="save"
-    >
+    <form>
         {{ $this->form }}
-    </x-filament-panels::form>
-</x-filament-panels::page>
+    </form>
+    <x-filament-actions::modals />
+</x-filament-panels::form>