diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl
index d42d44d84a..e0bbcbfefa 100755
--- a/admin/z3950servers.pl
+++ b/admin/z3950servers.pl
@@ -81,7 +81,7 @@ if( $op eq 'cud-delete_confirmed' && $id ) {
         Koha::Z3950Server->new( $formdata )->store;
         $template->param( msg_added => 1, msg_add => $formdata->{servername} );
     }
-} else {
+} elsif ($op eq 'cud-search') {
     #use searchfield only in remaining operations
     $searchfield = $input->param('searchfield') || '';
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
index 1519bbbb68..b23e7a9c08 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -12,7 +12,7 @@
                 <div class="form-content">
                     <input class="head-searchbox form-control" type="text" name="searchfield" id="searchfield" value="[% searchfield | html %]" placeholder="Z39.50/SRU server search" />
                 </div>
-
+                <input type="hidden" name="op" value="cud-search" />
                 <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button>
             </form>
         </div>