diff --git a/modules/search.module b/modules/search.module
index 34ac1ef98c1..a51a83f0136 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -886,7 +886,7 @@ function search_view() {
   // Search form submits with POST but redirects to GET. This way we can keep
   // the search query URL clean as a whistle:
   // search/type/keyword+keyword
-  if (isset($_POST['op'])) {
+  if (isset($_POST['edit']['keys'])) {
     if ($type == '') {
       $type = 'node';
     }
diff --git a/modules/search/search.module b/modules/search/search.module
index 34ac1ef98c1..a51a83f0136 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -886,7 +886,7 @@ function search_view() {
   // Search form submits with POST but redirects to GET. This way we can keep
   // the search query URL clean as a whistle:
   // search/type/keyword+keyword
-  if (isset($_POST['op'])) {
+  if (isset($_POST['edit']['keys'])) {
     if ($type == '') {
       $type = 'node';
     }