diff --git a/resources/views/dashboard/news/index.blade.php b/resources/views/dashboard/news/index.blade.php
index 9dffedd..6e59b34 100644
--- a/resources/views/dashboard/news/index.blade.php
+++ b/resources/views/dashboard/news/index.blade.php
@@ -119,28 +119,28 @@
                                                         <label class="form-label">Kategori</label>
                                                         <div class="form-control-wrap">
                                                             <select class="form-select js-select2" name="category">
-                                                                <option value="all">Semua Kategori</option>
-                                                                <option value="news">Berita</option>
-                                                                <option value="announcement">Pengumuman</option>
+                                                                <option value="all" @selected(isset($category) && $category == 'all')>Semua Kategori</option>
+                                                                <option value="news" @selected(isset($category) && $category == 'news')>Berita</option>
+                                                                <option value="announcement" @selected(isset($category) && $category == 'announcement')>Pengumuman</option>
                                                             </select>
                                                         </div>
                                                     </div>
                                                     <div class="form-group">
                                                         <label class="form-label" for="year">Tahun</label>
                                                         <div class="form-control-wrap">
-                                                            <input type="number" class="form-control" id="year" placeholder="Data berita pada tahun" name="year">
+                                                            <input type="number" class="form-control" id="year" placeholder="Data berita pada tahun" name="year" value="{{ old('year', $year ?? '') }}">
                                                         </div>
                                                     </div>
                                                     <div class="form-group">
                                                         <label class="form-label" for="month">Bulan</label>
                                                         <div class="form-control-wrap">
-                                                            <input type="month" class="form-control" id="month" placeholder="Data berita pada bulan dan tahun" name="month">
+                                                            <input type="month" class="form-control" id="month" placeholder="Data berita pada bulan dan tahun" name="month" value="{{ old('month', $month ?? '') }}">
                                                         </div>
                                                     </div>
                                                     <div class="form-group">
                                                         <label class="form-label" for="date">Tanggal</label>
                                                         <div class="form-control-wrap">
-                                                            <input type="date" class="form-control" id="date" placeholder="Data berita pada bulan dan tahun" name="date">
+                                                            <input type="date" class="form-control" id="date" placeholder="Data berita pada bulan dan tahun" name="date" value="{{ old('date', $date ?? '') }}">
                                                         </div>
                                                     </div>
                                                 </div>
diff --git a/resources/views/dashboard/news/show.blade.php b/resources/views/dashboard/news/show.blade.php
index 7c6d493..0b68e45 100644
--- a/resources/views/dashboard/news/show.blade.php
+++ b/resources/views/dashboard/news/show.blade.php
@@ -45,7 +45,7 @@
                                                                     <span class="profile-ud-label">Link</span>
                                                                     <span class="profile-ud-value">
                                                                         @if (filled($news->link))
-                                                                            <a href="{{$news->link}}">{{$news->link}}</a>
+                                                                            <a href="{{$news->link}}" target="__blank">{{$news->link}}</a>
                                                                         @else
                                                                         {{'-'}}
                                                                         @endif