diff --git a/include/client/faq-category.inc.php b/include/client/faq-category.inc.php
index 50a51782f214b8fc28b78f54afdd005c3f1a71df..32b4a9c63c3bb16a3c973d469b5975aa3f6ea5d5 100644
--- a/include/client/faq-category.inc.php
+++ b/include/client/faq-category.inc.php
@@ -11,7 +11,8 @@ $sql='SELECT faq.faq_id, question, count(attach.file_id) as attachments '
     .' FROM '.FAQ_TABLE.' faq '
     .' LEFT JOIN '.FAQ_ATTACHMENT_TABLE.' attach ON(attach.faq_id=faq.faq_id) '
     .' WHERE faq.ispublished=1 AND faq.category_id='.db_input($category->getId())
-    .' GROUP BY faq.faq_id';
+    .' GROUP BY faq.faq_id '
+    .' ORDER BY question';
 if(($res=db_query($sql)) && db_num_rows($res)) {
     echo '
          <h2>Frequently Asked Questions</h2>
diff --git a/include/client/knowledgebase.inc.php b/include/client/knowledgebase.inc.php
index 1d00ca59ca9ca0b5e6e42724986b61ccef4090fc..79bfa6836857a8b3123d030d8dbfd34c34e2da8a 100644
--- a/include/client/knowledgebase.inc.php
+++ b/include/client/knowledgebase.inc.php
@@ -78,7 +78,7 @@ if($_REQUEST['q'] || $_REQUEST['cid'] || $_REQUEST['topicId']) { //Search.
                  )";
     }
 
-    $sql.=' GROUP BY faq.faq_id';
+    $sql.=' GROUP BY faq.faq_id ORDER BY question';
     echo "<div><strong>Search Results</strong></div><div class='clear'></div>";
     if(($res=db_query($sql)) && ($num=db_num_rows($res))) {
         echo '<div id="faq">'.$num.' FAQs matched your search criteria.
diff --git a/include/staff/faq-categories.inc.php b/include/staff/faq-categories.inc.php
index cf8d7965011a9d05b3f25bf8a76b7a15fc2da392..8867a309ad66e2cd3d4675ed5d70e65f8e7c469b 100644
--- a/include/staff/faq-categories.inc.php
+++ b/include/staff/faq-categories.inc.php
@@ -76,7 +76,7 @@ if($_REQUEST['q'] || $_REQUEST['cid'] || $_REQUEST['topicId']) { //Search.
                  )";
     }
 
-    $sql.=' GROUP BY faq.faq_id';
+    $sql.=' GROUP BY faq.faq_id ORDER BY question';
 
     echo "<div><strong>Search Results</strong></div><div class='clear'></div>";
     if(($res=db_query($sql)) && db_num_rows($res)) {
diff --git a/include/staff/faq-category.inc.php b/include/staff/faq-category.inc.php
index f12ed8ae8f3d4c90b0245235525ce4160b6cd836..5f22cb6f89e5b063d3b2a3877226ab2b3de900a0 100644
--- a/include/staff/faq-category.inc.php
+++ b/include/staff/faq-category.inc.php
@@ -33,7 +33,7 @@ $sql='SELECT faq.faq_id, question, ispublished, count(attach.file_id) as attachm
     .' FROM '.FAQ_TABLE.' faq '
     .' LEFT JOIN '.FAQ_ATTACHMENT_TABLE.' attach ON(attach.faq_id=faq.faq_id) '
     .' WHERE faq.category_id='.db_input($category->getId())
-    .' GROUP BY faq.faq_id';
+    .' GROUP BY faq.faq_id ORDER BY question';
 if(($res=db_query($sql)) && db_num_rows($res)) {
     echo '<div id="faq">
             <ol>';