diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index 20d2660d0..81be4945e 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -557,6 +557,10 @@ class FilesTab(Tab):
 
     def _on_torrentfilerenamed_event(self, torrent_id, index, name):
         log.debug("index: %s name: %s", index, name)
+
+        if torrent_id not in self.files_list:
+            return
+
         old_name = self.files_list[torrent_id][index]["path"]
         self.files_list[torrent_id][index]["path"] = name
 
@@ -705,6 +709,9 @@ class FilesTab(Tab):
         log.debug("on_torrent_folder_renamed_signal")
         log.debug("old_folder: %s new_folder: %s", old_folder, new_folder)
 
+        if torrent_id not in self.files_list:
+            return
+
         if old_folder[-1] != "/":
             old_folder += "/"
         if new_folder[-1] != "/":