diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 5cad095fcd5..64e6dc3e41a 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -1476,7 +1476,7 @@ function glossary_print_comment($course, $cm, $glossary, $entry, $comment) {
     echo '<div class="boxaligncenter">';
     echo '<table class="glossarycomment" cellspacing="0">';
     echo '<tr valign="top">';
-    echo '<tr><td class="left picture">';
+    echo '<td class="left picture">';
     print_user_picture($user->id, $course->id, $user->picture);
     echo '</td>';
     echo '<td class="entryheader">';
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index ddd34ef285f..7eae7475753 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -407,6 +407,7 @@
                 $ratings->allow = true;
             }
             $formsent = 1;
+
             echo "<form method=\"post\" action=\"rate.php\">";
             echo "<div>";
             echo "<input type=\"hidden\" name=\"id\" value=\"$course->id\" />";
@@ -496,15 +497,16 @@
                 print_scale_menu_helpbutton($course->id, $scale );
             }
         }
-        echo "</div>";
-        echo "</div>";
+        echo "</div>";    
+    }
+    if ($entriesshown ) {
         echo "</form>";
     } else if (!empty($formsent)) {
         // close the form properly if not  used
         echo "</div>";
         echo "</form>";  
     }
-
+    
     if ( $paging ) {
         echo '<hr />';
         echo '<div class="paging">';