diff --git a/calendar/matrixselect.php b/calendar/matrixselect.php
index c11bd781d1..b9ac184568 100755
--- a/calendar/matrixselect.php
+++ b/calendar/matrixselect.php
@@ -48,7 +48,6 @@
 
   $phpgw->template->set_block("matrix_query_begin","list","matrix_query_end","form_button");
 
-//  $phpgw->template->set_var("bg_color",$phpgw_info["theme"]["bg_text"]);
   $phpgw->template->set_var("matrix_action",lang("Daily Matrix View"));
   $phpgw->template->set_var("action_url",$phpgw->link("timematrix.php"));
 
@@ -106,7 +105,12 @@
   $phpgw->template->set_var("data",$str);
   $phpgw->template->parse("output","list",True);
 
-  $phpgw->template->set_var("submit_button",lang("Submit"));
+  $phpgw->template->set_var("action_url_button","");
+  $phpgw->template->set_var("action_text_button",lang("Submit"));
+  $phpgw->template->set_var("action_confirm_button","onClick=\"document.matrixform.submit();\"");
+
+  $phpgw->template->parse("submit_button","form_button");
+
 
   $phpgw->template->set_var("action_url_button","");
   $phpgw->template->set_var("action_text_button",lang("Cancel"));
diff --git a/calendar/templates/default/matrix_query.tpl b/calendar/templates/default/matrix_query.tpl
index e1554269f0..44134426cd 100755
--- a/calendar/templates/default/matrix_query.tpl
+++ b/calendar/templates/default/matrix_query.tpl
@@ -3,7 +3,7 @@
 <center>
 <h2><font color="#000000">{matrix_action}</font></h2>
 
-<form action="{action_url}" method="post" name="matrixform">
+<form action="{action_url}" method="post" name="matrixform" target="timematrix">
 <table border="0" width="75%">
 <!-- END matrix_query_begin -->
 
@@ -11,8 +11,8 @@
 
 <!-- BEGIN matrix_query_end -->
 </table>
-<input type="submit" value="{submit_button}">
 </form>
+{submit_button}
 
 {cancel_button}
 </center>
diff --git a/calendar/timematrix.php b/calendar/timematrix.php
index 191522758f..85caaad67a 100755
--- a/calendar/timematrix.php
+++ b/calendar/timematrix.php
@@ -39,5 +39,14 @@
   $date = $thisyear.$thismonth.$thisday;
 
   echo $phpgw->calendar->timematrix($phpgw->calendar->date_to_epoch($date),0,0,$participants);
+  echo "<center>";
+  echo "<form action=\"".$phpgw->link("timematrix.php")."\" method=\"post\" name=\"matrixform\" target=\"timematrix\">";
+  echo "<input type=\"hidden\" name=\"date\" value=\"".$date."\">";
+  for ($i=0;$i<count($participants);$i++)
+    echo "<input type=\"hidden\" name=\"participants[]\" value=\"".$participants[$i]."\">";
+  echo "<input type=\"submit\" value=\"Refresh\">";
+  echo "</form>";
+  echo "</center>";
+
   $phpgw->common->phpgw_footer();
 ?>