diff --git a/src/gui_2.py b/src/gui_2.py
index 27f6355..3068a42 100644
--- a/src/gui_2.py
+++ b/src/gui_2.py
@@ -436,10 +436,15 @@ class App:
   sys.stderr.flush()
   if 'context_presets' not in self.controller.project:
    self.controller.project['context_presets'] = {}
-  self.controller.project['context_presets'][name] = {
-   'files': [f.to_dict() if hasattr(f, 'to_dict') else {'path': str(f)} for f in self.files],
-   'screenshots': list(self.screenshots)
-  }
+  
+  preset_files = []
+  for f in self.context_files:
+   path = f.path if hasattr(f, 'path') else str(f)
+   view_mode = f.view_mode if hasattr(f, 'view_mode') else 'summary'
+   preset_files.append(models.FileViewPreset(path=path, view_mode=view_mode))
+  
+  preset = models.ContextPreset(name=name, files=preset_files, screenshots=list(self.screenshots))
+  self.controller.project['context_presets'][name] = preset.to_dict()
   self.controller._save_active_project()
   sys.stderr.write(f"[DEBUG] save_context_preset finished. Project keys: {list(self.controller.project.keys())}\n")
   sys.stderr.flush()
@@ -450,9 +455,10 @@ class App:
   """
   presets = self.controller.project.get('context_presets', {})
   if name in presets:
-   preset = presets[name]
-   self.files = [models.FileItem.from_dict(f) if isinstance(f, dict) else models.FileItem(path=str(f)) for f in preset.get('files', [])]
-   self.screenshots = list(preset.get('screenshots', []))
+   preset_data = presets[name]
+   preset = models.ContextPreset.from_dict(name, preset_data)
+   self.context_files = [models.FileItem(path=f.path, view_mode=f.view_mode) for f in preset.files]
+   self.screenshots = list(preset.screenshots)
 
  def delete_context_preset(self, name: str) -> None:
   """
diff --git a/src/models.py b/src/models.py
index ffe4031..6343b1e 100644
--- a/src/models.py
+++ b/src/models.py
@@ -907,3 +907,42 @@ def load_mcp_config(path: str) -> MCPConfiguration:
    return MCPConfiguration.from_dict(data)
   except Exception:
    return MCPConfiguration()
+
+@dataclass
+class FileViewPreset:
+ path: str
+ view_mode: str = "summary"
+
+ def to_dict(self) -> dict[str, Any]:
+  return {
+   "path": self.path,
+   "view_mode": self.view_mode
+  }
+
+ @classmethod
+ def from_dict(cls, data: dict[str, Any]) -> "FileViewPreset":
+  return cls(
+   path=data.get("path", ""),
+   view_mode=data.get("view_mode", "summary")
+  )
+
+@dataclass
+class ContextPreset:
+ name: str
+ files: list[FileViewPreset] = field(default_factory=list)
+ screenshots: list[str] = field(default_factory=list)
+
+ def to_dict(self) -> dict[str, Any]:
+  return {
+   "files": [f.to_dict() for f in self.files],
+   "screenshots": self.screenshots
+  }
+
+ @classmethod
+ def from_dict(cls, name: str, data: dict[str, Any]) -> "ContextPreset":
+  files_data = data.get("files", [])
+  return cls(
+   name=name,
+   files=[FileViewPreset.from_dict(f) if isinstance(f, dict) else FileViewPreset(path=str(f)) for f in files_data],
+   screenshots=data.get("screenshots", [])
+  )
diff --git a/tests/test_context_presets_models.py b/tests/test_context_presets_models.py
new file mode 100644
index 0000000..cb81833
--- /dev/null
+++ b/tests/test_context_presets_models.py
@@ -0,0 +1,45 @@
+import pytest
+from src.models import ContextPreset, FileViewPreset
+
+def test_file_view_preset_serialization():
+    p = FileViewPreset(path="test.py", view_mode="skeleton")
+    d = p.to_dict()
+    assert d == {"path": "test.py", "view_mode": "skeleton"}
+    
+    p2 = FileViewPreset.from_dict(d)
+    assert p2.path == "test.py"
+    assert p2.view_mode == "skeleton"
+
+def test_context_preset_serialization():
+    f1 = FileViewPreset(path="a.py", view_mode="full")
+    f2 = FileViewPreset(path="b.py", view_mode="summary")
+    
+    preset = ContextPreset(
+        name="test_preset",
+        files=[f1, f2],
+        screenshots=["shot1.png"]
+    )
+    
+    d = preset.to_dict()
+    assert len(d["files"]) == 2
+    assert d["files"][0]["path"] == "a.py"
+    assert d["screenshots"] == ["shot1.png"]
+    
+    p2 = ContextPreset.from_dict("test_preset", d)
+    assert p2.name == "test_preset"
+    assert len(p2.files) == 2
+    assert p2.files[0].view_mode == "full"
+    assert p2.screenshots == ["shot1.png"]
+
+def test_context_preset_from_dict_legacy():
+    # Test handling of legacy string paths in preset files
+    d = {
+        "files": ["legacy.py", {"path": "new.py", "view_mode": "skeleton"}],
+        "screenshots": []
+    }
+    preset = ContextPreset.from_dict("legacy_test", d)
+    assert len(preset.files) == 2
+    assert preset.files[0].path == "legacy.py"
+    assert preset.files[0].view_mode == "summary" # Default
+    assert preset.files[1].path == "new.py"
+    assert preset.files[1].view_mode == "skeleton"