diff --git a/includes/node.inc b/includes/node.inc
index d5074ce61c9a930167562d20ffe876d630a59534..853e3d8d2653022ea1f438d7f3265f4053c95e0d 100644
--- a/includes/node.inc
+++ b/includes/node.inc
@@ -182,8 +182,9 @@ function visit(site) {
   else
     $choices = array("node.php?id=$node->nid" => t("view node"), "node.php?op=history&id=$node->nid" => t("view history"));
 
+  $output .= $REQUEST_URI;
   $output .= "<FORM METHOD=\"get\" ACTION=\"\">\n";
-  foreach ($choices as $key => $value) $options .= "<OPTION VALUE=\"$key\"". ("/$key" == $REQUEST_URI ? " SELECTED" : "") .">". check_select($value) ."</OPTION>\n";
+  foreach ($choices as $key => $value) $options .= "<OPTION VALUE=\"$key\"". (strstr($REQUEST_URI,"/$key") ? " SELECTED" : "") .">". check_select($value) ."</OPTION>\n";
   $output .= " <SELECT NAME=\"op\" ONCHANGE=\"visit(this.options[this.selectedIndex].value)\">$options</SELECT>\n";
   $output .= "</FORM>\n";