diff --git a/database/db.js b/database/db.js
index 86ff8bd..c6a4a9a 100644
--- a/database/db.js
+++ b/database/db.js
@@ -299,7 +299,7 @@ db.getUser = function(username) {
 
 db.getTags = function(user_id) {
     console.log('getTags');
-    var sql = "SELECT t.id, t.user_id, t.name, DATE_FORMAT(t.last_use, '%Y-%m-%d %H:%i:%s') as last_use, t.sort, tb.cnt FROM `tags` as t LEFT OUTER JOIN ( SELECT `tag_id`, COUNT(tag_id) as cnt FROM tags_bookmarks GROUP BY tag_id ) tb ON t.id = tb.tag_id WHERE t.user_id = '" + user_id + "' ORDER BY t.last_use DESC";
+    var sql = "SELECT t.id, t.user_id, t.name, DATE_FORMAT(t.last_use, '%Y-%m-%d %H:%i:%s') as last_use, t.sort, tb.cnt FROM `tags` as t LEFT OUTER JOIN ( SELECT `tag_id`, COUNT(tag_id) as cnt FROM tags_bookmarks GROUP BY tag_id ) tb ON t.id = tb.tag_id WHERE t.user_id = '" + user_id + "' ORDER BY t.sort, t.last_use DESC";
 
     return new Promise(function(resolve, reject) {
         client.query(sql, (err, result) => {
diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js
index 869db61..b1cdb1c 100644
--- a/public/scripts/controllers/tags-controller.js
+++ b/public/scripts/controllers/tags-controller.js
@@ -126,6 +126,10 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
         tag.edit = true;
     }
     $scope.updateTag = function(tag) {
+        if (tag.name == tag.oldName) {
+            toastr.warning('您没有编辑分类', "警告");
+            return;
+        }
         tag.edit = false;
         var params = {
             id: tag.id,
@@ -191,6 +195,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
     // TODO: 我要将编辑按钮固定在容器的右上角
     $(window).resize(updateEditPos);
     setTimeout(updateEditPos, 100);
+    setTimeout(updateEditPos, 500);
     setTimeout(updateEditPos, 1000);
     setTimeout(updateEditPos, 10000);
 
diff --git a/public/views/tags.html b/public/views/tags.html
index 5af8d71..4cf3dbd 100644
--- a/public/views/tags.html
+++ b/public/views/tags.html
@@ -10,7 +10,7 @@
         </div>
     </div>
     <div class="ui container" ng-show="edit">
-        <p>操作说明：拖拽分类即可进行排序</p>
+        <p>操作说明：拖拽分类即可进行排序(正在开发中...)</p>
         <div class="ui six stackable cards">
             <div class="card" ng-repeat="tag in tags">
                 <div class="content">