diff --git a/phpgwapi/inc/class.nextmatchs.inc.php b/phpgwapi/inc/class.nextmatchs.inc.php
index d9820c1dc6..838ffd1f85 100644
--- a/phpgwapi/inc/class.nextmatchs.inc.php
+++ b/phpgwapi/inc/class.nextmatchs.inc.php
@@ -362,7 +362,7 @@
 
 			if (is_array($filter_obj))
 			{
-				$str .= '<select name="filter">'."\n";
+				$str .='<select name="filter" onChange="this.form.submit()">'."\n";
 
 				$indexlimit = count($filter_obj);
 
diff --git a/phpgwapi/templates/default/nextmatchs_filter.tpl b/phpgwapi/templates/default/nextmatchs_filter.tpl
index cd33a39d71..27f4145e27 100644
--- a/phpgwapi/templates/default/nextmatchs_filter.tpl
+++ b/phpgwapi/templates/default/nextmatchs_filter.tpl
@@ -1 +1 @@
-<td width="14%">{select}<input type="submit" value="{lang_filter}"></td>
+<td width="14%">{select}<noscript><input type="submit" value="{lang_filter}"></noscript></td>
diff --git a/phpgwapi/templates/idsociety/nextmatchs_filter.tpl b/phpgwapi/templates/idsociety/nextmatchs_filter.tpl
index cd33a39d71..27f4145e27 100644
--- a/phpgwapi/templates/idsociety/nextmatchs_filter.tpl
+++ b/phpgwapi/templates/idsociety/nextmatchs_filter.tpl
@@ -1 +1 @@
-<td width="14%">{select}<input type="submit" value="{lang_filter}"></td>
+<td width="14%">{select}<noscript><input type="submit" value="{lang_filter}"></noscript></td>
diff --git a/phpgwapi/templates/justweb/nextmatchs_filter.tpl b/phpgwapi/templates/justweb/nextmatchs_filter.tpl
index cd33a39d71..27f4145e27 100644
--- a/phpgwapi/templates/justweb/nextmatchs_filter.tpl
+++ b/phpgwapi/templates/justweb/nextmatchs_filter.tpl
@@ -1 +1 @@
-<td width="14%">{select}<input type="submit" value="{lang_filter}"></td>
+<td width="14%">{select}<noscript><input type="submit" value="{lang_filter}"></noscript></td>
diff --git a/phpgwapi/templates/verdilak/nextmatchs_filter.tpl b/phpgwapi/templates/verdilak/nextmatchs_filter.tpl
index cd33a39d71..27f4145e27 100644
--- a/phpgwapi/templates/verdilak/nextmatchs_filter.tpl
+++ b/phpgwapi/templates/verdilak/nextmatchs_filter.tpl
@@ -1 +1 @@
-<td width="14%">{select}<input type="submit" value="{lang_filter}"></td>
+<td width="14%">{select}<noscript><input type="submit" value="{lang_filter}"></noscript></td>