diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js
index a877381f..3795f1b5 100644
--- a/media/js/jquery.dataTables.js
+++ b/media/js/jquery.dataTables.js
@@ -1954,7 +1954,12 @@
 				nFilter.id = oSettings.sTableId+'_filter';
 			}
 			
-			var jqFilter = $("input", nFilter);
+			var jqFilter = $('input[type="text"]', nFilter);
+		
+			// Store a reference to the input element, so other input elements could be
+			// added to the filter wrapper if needed (submit button for example)
+			nFilter._DT_Input = jqFilter[0];
+		
 			jqFilter.val( oPreviousSearch.sSearch.replace('"','"') );
 			jqFilter.bind( 'keyup.DT', function(e) {
 				/* Update all other filter input elements for the new display */
@@ -1963,7 +1968,7 @@
 				{
 					if ( n[i] != $(this).parents('div.dataTables_filter')[0] )
 					{
-						$('input', n[i]).val( this.value );
+						$(n[i]._DT_Input).val( this.value );
 					}
 				}
 				
@@ -5380,7 +5385,7 @@
 					var n = oSettings.aanFeatures.f;
 					for ( var i=0, iLen=n.length ; i<iLen ; i++ )
 					{
-						$('input', n[i]).val( sInput );
+						$(n[i]._DT_Input).val( sInput );
 					}
 				}
 			}
diff --git a/media/src/api/api.methods.js b/media/src/api/api.methods.js
index 9f535af1..3b1394b8 100644
--- a/media/src/api/api.methods.js
+++ b/media/src/api/api.methods.js
@@ -656,7 +656,7 @@ this.fnFilter = function( sInput, iColumn, bRegex, bSmart, bShowGlobal, bCaseIns
 			var n = oSettings.aanFeatures.f;
 			for ( var i=0, iLen=n.length ; i<iLen ; i++ )
 			{
-				$('input', n[i]).val( sInput );
+				$(n[i]._DT_Input).val( sInput );
 			}
 		}
 	}
diff --git a/media/src/core/core.filter.js b/media/src/core/core.filter.js
index 4dd05bf1..4cd1436b 100644
--- a/media/src/core/core.filter.js
+++ b/media/src/core/core.filter.js
@@ -23,7 +23,12 @@ function _fnFeatureHtmlFilter ( oSettings )
 		nFilter.id = oSettings.sTableId+'_filter';
 	}
 	
-	var jqFilter = $("input", nFilter);
+	var jqFilter = $('input[type="text"]', nFilter);
+
+	// Store a reference to the input element, so other input elements could be
+	// added to the filter wrapper if needed (submit button for example)
+	nFilter._DT_Input = jqFilter[0];
+
 	jqFilter.val( oPreviousSearch.sSearch.replace('"','&quot;') );
 	jqFilter.bind( 'keyup.DT', function(e) {
 		/* Update all other filter input elements for the new display */
@@ -32,7 +37,7 @@ function _fnFeatureHtmlFilter ( oSettings )
 		{
 			if ( n[i] != $(this).parents('div.dataTables_filter')[0] )
 			{
-				$('input', n[i]).val( this.value );
+				$(n[i]._DT_Input).val( this.value );
 			}
 		}