diff --git a/cardvault/application.py b/cardvault/application.py
index 4c59ea4..0e5979a 100644
--- a/cardvault/application.py
+++ b/cardvault/application.py
@@ -263,6 +263,8 @@ class Application:
         self.unsaved_changes = True
 
     def rename_tag(self, old, new):
+        if old == new:
+            return
         self.tags[new] = self.tags[old]
         del self.tags[old]
         util.log("Tag '" + old + "' renamed to '" + new + "'", util.LogLevel.Info)
@@ -287,6 +289,8 @@ class Application:
         self.unsaved_changes = True
 
     def rename_want_list(self, old, new):
+        if old == new:
+            return
         self.wants[new] = self.wants[old]
         del self.wants[old]
         util.log("Want List '" + old + "' renamed to '" + new + "'", util.LogLevel.Info)
diff --git a/cardvault/library.py b/cardvault/library.py
index 5d421ff..00e4849 100644
--- a/cardvault/library.py
+++ b/cardvault/library.py
@@ -67,14 +67,22 @@ class LibraryHandlers:
             tag = model.get_value(tree_iter, 0)
 
             new_name = self.app.show_name_enter_dialog("Rename Tag", tag)
-            self.app.rename_tag(tag, new_name)
-            self.app.current_page.emit('show')
+            if new_name and new_name != "":
+                self.app.rename_tag(tag, new_name)
+                self.app.current_page.emit('show')
 
     def do_tag_list_delete(self, tree):
         (model, pathlist) = tree.get_selection().get_selected_rows()
         for path in pathlist:
             tree_iter = model.get_iter(path)
             tag = model.get_value(tree_iter, 0)
+            question = "Really delete tag: {}?".format(tag)
+            dialog = Gtk.MessageDialog(self.app.ui.get_object("mainWindow"), 0, Gtk.MessageType.WARNING,
+                                       Gtk.ButtonsType.YES_NO, question)
+            response = dialog.run()
+            dialog.destroy()
+            if response == Gtk.ResponseType.NO:
+                return
             self.app.remove_tag(tag)
             self.app.current_page.emit('show')