diff --git a/ChangeLog b/ChangeLog
index 1dc0010e4..710e824b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 === Deluge 1.1.8 - (In Development) ===
 ==== Core ====
   * Fix pause all/resume all
+  * Torrent name is now changed when the root folder or file is renamed
 
 ==== GtkUI ====
   * Fix high cpu usage when displaying speeds in titlebar
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 16b1aaf7a..c9f5febe8 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -637,10 +637,11 @@ class Torrent:
 
         def ti_name():
             if self.handle.has_metadata():
+                name = os.path.split(self.torrent_info.file_at(0).path)[0]
                 try:
-                    return self.torrent_info.name().decode("utf8", "ignore")
+                    return name.decode("utf8", "ignore")
                 except UnicodeDecodeError:
-                    return self.torrent_info.name()
+                    return name
 
             return self.torrent_id
         def ti_priv():