diff --git a/templates/dashboard.php b/templates/dashboard.php
index 175d1255..35a4afb5 100644
--- a/templates/dashboard.php
+++ b/templates/dashboard.php
@@ -90,7 +90,7 @@ exec('cat '.RASPI_DNSMASQ_LEASES.'| grep -E $(arp -i '.$client_iface.' -n | grep
               <?php else: ?>
                 <input type="submit" class="btn btn-warning" value="<?php echo _("Stop ").RASPI_WIFI_CLIENT_INTERFACE ?>"  name="ifdown_wlan0" />
               <?php endif ?>
-              <input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
+              <a href="?page=<?php echo $_GET['page'] ?>" class="btn btn-outline btn-primary"><?php echo _("Refresh") ?></a>
             </form>
           </div>
         </div>
diff --git a/templates/system.php b/templates/system.php
index 608e96d4..9f184ad7 100644
--- a/templates/system.php
+++ b/templates/system.php
@@ -69,7 +69,7 @@ if ($cpuload > 90) {
         <?php echo CSRFTokenFieldTag() ?>
         <input type="submit" class="btn btn-warning" name="system_reboot"   value="<?php echo _("Reboot"); ?>" />
         <input type="submit" class="btn btn-warning" name="system_shutdown" value="<?php echo _("Shutdown"); ?>" />
-        <input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
+        <a href="?page=<?php echo $_GET['page'] ?>" class="btn btn-outline btn-primary"><?php echo _("Refresh") ?></a>
         </form>
       </div>
     </div>
@@ -84,7 +84,7 @@ if ($cpuload > 90) {
       </div>
     </div>
     <input type="submit" class="btn btn-outline btn-primary" name="SaveLanguage" value="<?php echo _("Save settings"); ?>" />
-    <input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
+    <a href="?page=<?php echo $_GET['page'] ?>" class="btn btn-outline btn-primary"><?php echo _("Refresh") ?></a>
   </div>
 
   <div role="tabpanel" class="tab-pane" id="console">
diff --git a/templates/themes.php b/templates/themes.php
index 1a4d41a8..8920ad00 100644
--- a/templates/themes.php
+++ b/templates/themes.php
@@ -15,7 +15,7 @@
 
         <form action="?page=system_info" method="POST">
           <?php echo CSRFTokenFieldTag() ?>
-          <input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
+          <a href="?page=<?php echo $_GET['page'] ?>" class="btn btn-outline btn-primary"><?php echo _("Refresh"); ?></a>
         </form>
 
       </div><!-- /.panel-body -->