diff --git a/CHDataManagement/Main/MainView.swift b/CHDataManagement/Main/MainView.swift
index 580296b..7113b2f 100644
--- a/CHDataManagement/Main/MainView.swift
+++ b/CHDataManagement/Main/MainView.swift
@@ -60,9 +60,6 @@ struct MainView: App {
     @State
     private var selectedTag: Tag?
 
-    @State
-    private var selectedFile: FileResource?
-
     @State
     private var selectedSection: SettingsSection = .folders
 
@@ -82,7 +79,7 @@ struct MainView: App {
         case .tags:
             TagListView(selectedTag: $selectedTag)
         case .files:
-            FileListView(selectedFile: $selectedFile)
+            FileListView(selectedFile: $content.selectedFile)
         case .generation:
             SettingsListView(selectedSection: $selectedSection)
         }
@@ -98,7 +95,7 @@ struct MainView: App {
         case .tags:
             SelectedContentView<TagContentView>(selected: $selectedTag)
         case .files:
-            SelectedContentView<FileContentView>(selected: $selectedFile)
+            SelectedContentView<FileContentView>(selected: $content.selectedFile)
         case .generation:
             GenerationContentView(selected: $selectedSection)
         }
@@ -114,7 +111,7 @@ struct MainView: App {
         case .tags:
             SelectedDetailView<TagDetailView>(selected: $selectedTag)
         case .files:
-            SelectedDetailView<FileDetailView>(selected: $selectedFile)
+            SelectedDetailView<FileDetailView>(selected: $content.selectedFile)
         case .generation:
             GenerationDetailView(section: selectedSection)
         }
@@ -130,7 +127,7 @@ struct MainView: App {
         case .tags:
             AddTagView(selected: $selectedTag)
         case .files:
-            AddFileView(selectedFile: $selectedFile)
+            AddFileView(selectedFile: $content.selectedFile)
         case .generation:
             Text("Not implemented")
         }
diff --git a/CHDataManagement/Model/Content.swift b/CHDataManagement/Model/Content.swift
index f367c50..ccb8a1f 100644
--- a/CHDataManagement/Model/Content.swift
+++ b/CHDataManagement/Model/Content.swift
@@ -37,6 +37,9 @@ final class Content: ObservableObject {
     @Published
     private(set) var shouldGenerateWebsite = false
 
+    @State
+    var selectedFile: FileResource?
+
     let imageGenerator: ImageGenerator
 
     init(settings: Settings,
@@ -135,7 +138,9 @@ final class Content: ObservableObject {
             tag.remove(file)
         }
         settings.remove(file)
-        #warning("Remove MainView.selectedFile when deleting file")
+        if selectedFile == file {
+            selectedFile = nil
+        }
     }
 
     func file(withOutputPath: String) -> FileResource? {
diff --git a/CHDataManagement/Views/Files/FileDetailView.swift b/CHDataManagement/Views/Files/FileDetailView.swift
index 38f2364..2e63944 100644
--- a/CHDataManagement/Views/Files/FileDetailView.swift
+++ b/CHDataManagement/Views/Files/FileDetailView.swift
@@ -40,12 +40,6 @@ struct FileDetailView: View {
     @ObservedObject
     var file: FileResource
 
-    @State
-    private var showFileSelection = false
-
-    @State
-    private var selectedFile: FileResource?
-
     var body: some View {
         ScrollView {
             VStack(alignment: .leading) {