diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp
index 4960a94d0..4750a6a84 100644
--- a/src/base/bittorrent/torrenthandle.cpp
+++ b/src/base/bittorrent/torrenthandle.cpp
@@ -1213,10 +1213,8 @@ void TorrentHandle::setName(const QString &name)
 bool TorrentHandle::setCategory(const QString &category)
 {
     if (m_category != category) {
-        if (!category.isEmpty()) {
-            if (!Session::isValidCategoryName(category) || !m_session->categories().contains(category))
-                return false;
-        }
+        if (!category.isEmpty() && !m_session->categories().contains(category))
+            return false;
 
         QString oldCategory = m_category;
         m_category = category;
diff --git a/src/webui/api/synccontroller.cpp b/src/webui/api/synccontroller.cpp
index 9c1995f06..597a207e3 100644
--- a/src/webui/api/synccontroller.cpp
+++ b/src/webui/api/synccontroller.cpp
@@ -399,16 +399,17 @@ void SyncController::maindataAction()
 
     data["torrents"] = torrents;
 
-    QVariantList categoriesList;
-    const auto categories = session->categories();
-    for (auto key : categories.keys()) {
-        categoriesList << QVariantMap {
+    QVariantHash categories;
+    const auto categoriesList = session->categories();
+    for (auto it = categoriesList.cbegin(); it != categoriesList.cend(); ++it) {
+        const auto key = it.key();
+        categories[key] = QVariantMap {
             {"name", key},
-            {"savePath", categories.value(key)},
+            {"savePath", it.value()}
         };
     }
 
-    data["categories"] = categoriesList;
+    data["categories"] = categories;
 
     QVariantMap serverState = getTranserInfo();
     serverState[KEY_SYNC_MAINDATA_QUEUEING] = session->isQueueingSystemEnabled();
diff --git a/src/webui/api/torrentscontroller.cpp b/src/webui/api/torrentscontroller.cpp
index 9eb3d1b65..0b23e1e94 100644
--- a/src/webui/api/torrentscontroller.cpp
+++ b/src/webui/api/torrentscontroller.cpp
@@ -738,7 +738,7 @@ void TorrentsController::setLocationAction()
     const QString newLocation {params()["location"].trimmed()};
 
     if (newLocation.isEmpty())
-        throw APIError(APIErrorType::BadParams, tr("Save path is empty"));
+        throw APIError(APIErrorType::BadParams, tr("Save path cannot be empty"));
 
     // try to create the location if it does not exist
     if (!QDir(newLocation).mkpath("."))
@@ -809,12 +809,9 @@ void TorrentsController::setCategoryAction()
 
     const QStringList hashes {params()["hashes"].split('|')};
     const QString category {params()["category"].trimmed()};
+
     applyToTorrents(hashes, [category](BitTorrent::TorrentHandle *torrent)
     {
-        auto *session = BitTorrent::Session::instance();
-        const QStringList categories = session->categories().keys();
-        if (!categories.contains(category) && !session->addCategory(category))
-            throw APIError(APIErrorType::Conflict, tr("Unable to create category"));
         if (!torrent->setCategory(category))
             throw APIError(APIErrorType::Conflict, tr("Incorrect category name"));
     });
@@ -825,10 +822,30 @@ void TorrentsController::createCategoryAction()
     checkParams({"category"});
 
     const QString category {params()["category"].trimmed()};
-    if (!BitTorrent::Session::isValidCategoryName(category) && !category.isEmpty())
+    const QString savePath {params()["savePath"]};
+
+    if (category.isEmpty())
+        throw APIError(APIErrorType::BadParams, tr("Category cannot be empty"));
+
+    if (!BitTorrent::Session::isValidCategoryName(category))
         throw APIError(APIErrorType::Conflict, tr("Incorrect category name"));
 
-    BitTorrent::Session::instance()->addCategory(category);
+    if (!BitTorrent::Session::instance()->addCategory(category, savePath))
+        throw APIError(APIErrorType::Conflict, tr("Unable to create category"));
+}
+
+void TorrentsController::editCategoryAction()
+{
+    checkParams({"category", "savePath"});
+
+    const QString category {params()["category"].trimmed()};
+    const QString savePath {params()["savePath"]};
+
+    if (category.isEmpty())
+        throw APIError(APIErrorType::BadParams, tr("Category cannot be empty"));
+
+    if (!BitTorrent::Session::instance()->editCategory(category, savePath))
+        throw APIError(APIErrorType::Conflict, tr("Unable to edit category"));
 }
 
 void TorrentsController::removeCategoriesAction()
diff --git a/src/webui/api/torrentscontroller.h b/src/webui/api/torrentscontroller.h
index 0abaa30a3..5ddcaf6b0 100644
--- a/src/webui/api/torrentscontroller.h
+++ b/src/webui/api/torrentscontroller.h
@@ -53,6 +53,7 @@ private slots:
     void renameAction();
     void setCategoryAction();
     void createCategoryAction();
+    void editCategoryAction();
     void removeCategoriesAction();
     void addAction();
     void deleteAction();
diff --git a/src/webui/extra_translations.h b/src/webui/extra_translations.h
index d06ad9a0e..2d8ce1123 100644
--- a/src/webui/extra_translations.h
+++ b/src/webui/extra_translations.h
@@ -78,7 +78,8 @@ const char *QBT_WEBUI_TRANSLATIONS[] = {
     QT_TRANSLATE_NOOP("HttpServer", "Set location"),
     QT_TRANSLATE_NOOP("HttpServer", "Limit upload rate"),
     QT_TRANSLATE_NOOP("HttpServer", "Limit download rate"),
-    QT_TRANSLATE_NOOP("HttpServer", "Rename torrent")
+    QT_TRANSLATE_NOOP("HttpServer", "Rename torrent"),
+    QT_TRANSLATE_NOOP("HttpServer", "Unable to create category")
 };
 
 const struct { const char *source; const char *comment; } QBT_WEBUI_COMMENTED_TRANSLATIONS[] = {
diff --git a/src/webui/www/private/filters.html b/src/webui/www/private/filters.html
index 890431a4b..afe65ecb6 100644
--- a/src/webui/www/private/filters.html
+++ b/src/webui/www/private/filters.html
@@ -23,6 +23,9 @@
             CreateCategory: function(element, ref) {
                 createCategoryFN();
             },
+            EditCategory: function(element, ref) {
+                editCategoryFN(element.id);
+            },
             DeleteCategory: function(element, ref) {
                 removeCategoryFN(element.id);
             },
diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html
index 8947633ab..de6ccbb15 100644
--- a/src/webui/www/private/index.html
+++ b/src/webui/www/private/index.html
@@ -143,6 +143,7 @@
     </ul>
     <ul id="categoriesFilterMenu" class="contextMenu">
         <li><a href="#CreateCategory"><img src="images/qbt-theme/list-add.svg" alt="QBT_TR(Add category...)QBT_TR[CONTEXT=CategoryFilterWidget]"/> QBT_TR(Add category...)QBT_TR[CONTEXT=CategoryFilterWidget]</a></li>
+        <li><a href="#EditCategory"><img src="images/qbt-theme/document-edit.svg" alt="QBT_TR(Edit category...)QBT_TR[CONTEXT=CategoryFilterWidget]"/> QBT_TR(Edit category...)QBT_TR[CONTEXT=CategoryFilterWidget]</a></li>
         <li><a href="#DeleteCategory"><img src="images/qbt-theme/list-remove.svg" alt="QBT_TR(Remove category)QBT_TR[CONTEXT=CategoryFilterWidget]"/> QBT_TR(Remove category)QBT_TR[CONTEXT=CategoryFilterWidget]</a></li>
         <li><a href="#DeleteUnusedCategories"><img src="images/qbt-theme/list-remove.svg" alt="QBT_TR(Remove unused categories)QBT_TR[CONTEXT=CategoryFilterWidget]"/> QBT_TR(Remove unused categories)QBT_TR[CONTEXT=CategoryFilterWidget]</a></li>
         <li class="separator"><a href="#StartTorrentsByCategory"><img src="images/qbt-theme/media-playback-start.svg" alt="QBT_TR(Resume torrents)QBT_TR[CONTEXT=CategoryFilterWidget]"/> QBT_TR(Resume torrents)QBT_TR[CONTEXT=CategoryFilterWidget]</a></li>
diff --git a/src/webui/www/private/newcategory.html b/src/webui/www/private/newcategory.html
index eaa62752c..57fd53490 100644
--- a/src/webui/www/private/newcategory.html
+++ b/src/webui/www/private/newcategory.html
@@ -7,12 +7,13 @@
     <link rel="stylesheet" href="css/style.css" type="text/css" />
     <script src="scripts/lib/mootools-1.2-core-yc.js"></script>
     <script src="scripts/lib/mootools-1.2-more.js"></script>
+    <script src="scripts/misc.js"></script>
     <script>
         var newCategoryKeyboardEvents = new Keyboard({
             defaultEventType: 'keydown',
             events: {
                 'enter': function(event) {
-                    $('newCategoryButton').click();
+                    $('categoryNameButton').click();
                     event.preventDefault();
                 }
             }
@@ -20,42 +21,99 @@
         newCategoryKeyboardEvents.activate();
 
         window.addEvent('domready', function() {
-            $('newCategory').focus();
-            $('newCategoryButton').addEvent('click', function(e) {
-                new Event(e).stop();
-                // check field
-                var categoryName = $('newCategory').value.trim();
-                if (categoryName == null || categoryName == "")
-                    return false;
-                if (categoryName.match("^([^\\\\\\/]|[^\\\\\\/]([^\\\\\\/]|\\/(?=[^\\/]))*[^\\\\\\/])$") === null) {
-                    alert("QBT_TR(Invalid category name:\nPlease do not use any special characters in the category name.)QBT_TR[CONTEXT=HttpServer]");
+            var uriAction = safeTrim(new URI().getData('action'));
+            var uriHashes = safeTrim(new URI().getData('hashes'));
+            var uriCategoryName = safeTrim(new URI().getData('categoryName'));
+            var uriSavePath = safeTrim(new URI().getData('savePath'));
+
+            if (uriAction === "create") {
+                $('categoryName').focus();
+            }
+            else if (uriAction === "edit") {
+                if (!uriCategoryName)
                     return false;
-                }
-                var hashesList = new URI().getData('hashes');
-                if (!hashesList) {
-                    new Request({
-                        url: 'api/v2/torrents/createCategory',
-                        method: 'post',
-                        data: {
-                            category: categoryName
-                        },
-                        onComplete: function() {
-                            window.parent.closeWindows();
-                        }
-                    }).send();
-                }
-                else {
-                    new Request({
-                        url: 'api/v2/torrents/setCategory',
-                        method: 'post',
-                        data: {
-                            hashes: hashesList,
-                            category: categoryName
-                        },
-                        onComplete: function() {
-                            window.parent.closeWindows();
-                        }
-                    }).send();
+
+                $('categoryName').set('disabled', true);
+                $('categoryName').set('value', escapeHtml(uriCategoryName));
+                $('savePath').set('value', escapeHtml(uriSavePath));
+                $('savePath').focus();
+            }
+
+            $('categoryNameButton').addEvent('click', function(e) {
+                new Event(e).stop();
+
+                var savePath = $('savePath').value.trim();
+                var categoryName = $('categoryName').value.trim();
+
+                var verifyCategoryName = function(name) {
+                    if ((name === null) || (name === ""))
+                        return false;
+                    if (name.match("^([^\\\\\\/]|[^\\\\\\/]([^\\\\\\/]|\\/(?=[^\\/]))*[^\\\\\\/])$") === null) {
+                        alert("QBT_TR(Invalid category name:\nPlease do not use any special characters in the category name.)QBT_TR[CONTEXT=HttpServer]");
+                        return false;
+                    }
+                    return true;
+                };
+
+                switch (uriAction) {
+                    case "set":
+                        if ((uriHashes === "") || !verifyCategoryName(categoryName))
+                            return;
+
+                        new Request({
+                            url: 'api/v2/torrents/createCategory',
+                            method: 'post',
+                            data: {
+                                category: categoryName,
+                                savePath: savePath
+                            },
+                            onSuccess: function() {
+                                new Request({
+                                    url: 'api/v2/torrents/setCategory',
+                                    method: 'post',
+                                    data: {
+                                        hashes: uriHashes,
+                                        category: categoryName
+                                    },
+                                    onComplete: function() {
+                                        window.parent.closeWindows();
+                                    }
+                                }).send();
+                            },
+                            onError: function() {
+                                alert("QBT_TR(Unable to create category)QBT_TR[CONTEXT=HttpServer] " + escapeHtml(categoryName));
+                            }
+                        }).send();
+                        break;
+                    case "create":
+                        if (!verifyCategoryName(categoryName))
+                            return;
+
+                        new Request({
+                            url: 'api/v2/torrents/createCategory',
+                            method: 'post',
+                            data: {
+                                category: categoryName,
+                                savePath: savePath
+                            },
+                            onComplete: function() {
+                                window.parent.closeWindows();
+                            }
+                        }).send();
+                        break;
+                    case "edit":
+                        new Request({
+                            url: 'api/v2/torrents/editCategory',
+                            method: 'post',
+                            data: {
+                                category: uriCategoryName, // category name can't be changed
+                                savePath: savePath
+                            },
+                            onComplete: function() {
+                                window.parent.closeWindows();
+                            }
+                        }).send();
+                        break;
                 }
             });
         });
@@ -65,9 +123,11 @@
 <body>
     <div style="padding: 10px 10px 0px 10px;">
         <p style="font-weight: bold;">QBT_TR(Category)QBT_TR[CONTEXT=TransferListWidget]:</p>
-        <input type="text" id="newCategory" value="" maxlength="100" style="width: 220px;" />
+        <input type="text" id="categoryName" value="" maxlength="100" style="width: 220px;" />
+        <p style="font-weight: bold;">QBT_TR(Save path)QBT_TR[CONTEXT=TransferListWidget]:</p>
+        <input type="text" id="savePath" value="" style="width: 220px;" />
         <div style="text-align: center; padding-top: 10px;">
-            <input type="button" value="QBT_TR(Add)QBT_TR[CONTEXT=HttpServer]" id="newCategoryButton" />
+            <input type="button" value="QBT_TR(Add)QBT_TR[CONTEXT=HttpServer]" id="categoryNameButton" />
         </div>
     </div>
 </body>
diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js
index 667298ce9..f7019df55 100644
--- a/src/webui/www/private/scripts/client.js
+++ b/src/webui/www/private/scripts/client.js
@@ -316,19 +316,26 @@ window.addEvent('load', function() {
                         syncMainDataLastResponseId = response['rid'];
                     }
                     if (response['categories']) {
-                        response['categories'].each(function(category) {
-                            var categoryHash = genHash(category.name);
-                            category_list[categoryHash] = {
-                                name: category.name,
-                                savePath: category.savePath,
-                                torrents: []
-                            };
-                        });
+                        for (var key in response['categories']) {
+                            var category = response['categories'][key];
+                            var categoryHash = genHash(key);
+                            if (category_list[categoryHash] !== undefined) {
+                                // only the save path can change for existing categories
+                                category_list[categoryHash].savePath = category.savePath;
+                            }
+                            else {
+                                category_list[categoryHash] = {
+                                    name: category.name,
+                                    savePath: category.savePath,
+                                    torrents: []
+                                };
+                            }
+                        }
                         update_categories = true;
                     }
                     if (response['categories_removed']) {
                         response['categories_removed'].each(function(category) {
-                            var categoryHash = genHash(category.name);
+                            var categoryHash = genHash(category);
                             delete category_list[categoryHash];
                         });
                         update_categories = true;
diff --git a/src/webui/www/private/scripts/contextmenu.js b/src/webui/www/private/scripts/contextmenu.js
index fa28687bb..7c1208e3d 100644
--- a/src/webui/www/private/scripts/contextmenu.js
+++ b/src/webui/www/private/scripts/contextmenu.js
@@ -387,9 +387,13 @@ var CategoriesFilterContextMenu = new Class({
     Extends: ContextMenu,
     updateMenuItems: function() {
         var id = this.options.element.id;
-        if (id != CATEGORIES_ALL && id != CATEGORIES_UNCATEGORIZED)
+        if ((id != CATEGORIES_ALL) && (id != CATEGORIES_UNCATEGORIZED)) {
+            this.showItem('EditCategory');
             this.showItem('DeleteCategory');
-        else
+        }
+        else {
+            this.hideItem('EditCategory');
             this.hideItem('DeleteCategory');
+        }
     }
 });
diff --git a/src/webui/www/private/scripts/misc.js b/src/webui/www/private/scripts/misc.js
index fb6f4341d..5607de229 100644
--- a/src/webui/www/private/scripts/misc.js
+++ b/src/webui/www/private/scripts/misc.js
@@ -120,3 +120,14 @@ function escapeHtml(str) {
     div.appendChild(document.createTextNode(str));
     return div.innerHTML;
 }
+
+function safeTrim(value) {
+    try {
+        return value.trim();
+    }
+    catch (e) {
+        if (e instanceof TypeError)
+            return "";
+        throw e;
+    }
+}
diff --git a/src/webui/www/private/scripts/mocha-init.js b/src/webui/www/private/scripts/mocha-init.js
index 49a5f893d..6c48cbf11 100644
--- a/src/webui/www/private/scripts/mocha-init.js
+++ b/src/webui/www/private/scripts/mocha-init.js
@@ -458,20 +458,21 @@ initializeWindows = function() {
     };
 
     torrentNewCategoryFN = function() {
+        var action = "set";
         var hashes = torrentsTable.selectedRowsIds();
         if (hashes.length) {
             new MochaUI.Window({
                 id: 'newCategoryPage',
                 title: "QBT_TR(New Category)QBT_TR[CONTEXT=TransferListWidget]",
                 loadMethod: 'iframe',
-                contentURL: 'newcategory.html?hashes=' + hashes.join('|'),
+                contentURL: 'newcategory.html?action=' + action + '&hashes=' + hashes.join('|'),
                 scrollbars: false,
                 resizable: false,
                 maximizable: false,
                 paddingVertical: 0,
                 paddingHorizontal: 0,
                 width: 250,
-                height: 100
+                height: 150
             });
         }
     };
@@ -494,18 +495,39 @@ initializeWindows = function() {
     };
 
     createCategoryFN = function() {
+        var action = "create";
         new MochaUI.Window({
             id: 'newCategoryPage',
             title: "QBT_TR(New Category)QBT_TR[CONTEXT=CategoryFilterWidget]",
             loadMethod: 'iframe',
-            contentURL: 'newcategory.html',
+            contentURL: 'newcategory.html?action=' + action,
             scrollbars: false,
             resizable: false,
             maximizable: false,
             paddingVertical: 0,
             paddingHorizontal: 0,
             width: 250,
-            height: 100
+            height: 150
+        });
+        updateMainData();
+    };
+
+    editCategoryFN = function(categoryHash) {
+        var action = "edit";
+        var categoryName = category_list[categoryHash].name;
+        var savePath = category_list[categoryHash].savePath;
+        new MochaUI.Window({
+            id: 'editCategoryPage',
+            title: "QBT_TR(Edit Category)QBT_TR[CONTEXT=TransferListWidget]",
+            loadMethod: 'iframe',
+            contentURL: 'newcategory.html?action=' + action + '&categoryName=' + categoryName + '&savePath=' + savePath,
+            scrollbars: false,
+            resizable: false,
+            maximizable: false,
+            paddingVertical: 0,
+            paddingHorizontal: 0,
+            width: 250,
+            height: 150
         });
         updateMainData();
     };