diff --git a/src/App/Controller/AbstractController.php b/src/App/Controller/AbstractController.php
index acee4f6..2f72cd2 100644
--- a/src/App/Controller/AbstractController.php
+++ b/src/App/Controller/AbstractController.php
@@ -29,7 +29,7 @@ abstract class AbstractController implements ControllerInterface {
     abstract public function getBody(): string;
 
     public function setHeaders(array $headers): AbstractController {
-        $this->headers = $headers;
+        $this->headers = array_merge($this->headers ?? [], $headers);
         return $this;
     }
 
diff --git a/src/App/Controller/AbstractIPListController.php b/src/App/Controller/AbstractIPListController.php
index 965f121..51722ac 100644
--- a/src/App/Controller/AbstractIPListController.php
+++ b/src/App/Controller/AbstractIPListController.php
@@ -27,6 +27,12 @@ abstract class AbstractIPListController extends AbstractController {
 
         $this->logger = App::getLogger();
         $this->service = IPListService::getInstance();
+
+        $isFileSave = !!($this->request->getQueryParameter('filesave') ?? '');
+        if ($isFileSave) {
+            $ext = in_array($this->request->getQueryParameter('format'), ['json', 'amnezia']) ? 'json' : 'txt';
+            $this->setHeaders(['content-disposition' => 'attachment; filename="ip-list.' . $ext . '"']);
+        }
     }
 
     /**
diff --git a/src/App/Template/IndexTemplate.php b/src/App/Template/IndexTemplate.php
index c09f64a..50428b6 100644
--- a/src/App/Template/IndexTemplate.php
+++ b/src/App/Template/IndexTemplate.php
@@ -591,6 +591,7 @@ use OpenCCK\App\Controller\MainController;
             display: flex;
             flex-wrap: wrap;
             justify-content: center;
+            margin-bottom: 10px;
         }
         .main-formItemComment {
             flex: 0 0 100%;
@@ -611,6 +612,7 @@ use OpenCCK\App\Controller\MainController;
             line-height: 1;
             font-size: 14px;
             font-weight: normal;
+            cursor: pointer;
         }
     </style>
 </head>
@@ -664,6 +666,10 @@ use OpenCCK\App\Controller\MainController;
                     <input class="main-formItemCheckbox" type="checkbox" name="wildcard" value="1" />
                     <span class="main-formItemCheckboxLabel">Only wildcard domains</span>
                 </label>
+                <label class="main-formItem main-formItem_wide">
+                    <input class="main-formItemCheckbox" type="checkbox" name="filesave" value="1" />
+                    <span class="main-formItemCheckboxLabel">Save as file</span>
+                </label>
             </section>
             <section>
                 <button type="submit">Submit</button>