diff --git a/picard/plugin.py b/picard/plugin.py
index 6b13e0a78..d9b141c8d 100644
--- a/picard/plugin.py
+++ b/picard/plugin.py
@@ -381,6 +381,10 @@ class PluginManager(QtCore.QObject):
             for filepath in filepaths:
                 log.debug("Removing file %r", filepath)
                 os.remove(filepath)
+                update = filepath + '.update'
+                if os.path.isfile(update):
+                    log.debug("Removing file %r", update)
+                    os.remove(update)
 
     def install_plugin(self, path, action, overwrite_confirm=None, plugin_name=None,
                        plugin_data=None):
diff --git a/picard/ui/options/plugins.py b/picard/ui/options/plugins.py
index a8c2ebdbf..2d3c9b801 100644
--- a/picard/ui/options/plugins.py
+++ b/picard/ui/options/plugins.py
@@ -402,7 +402,7 @@ class PluginsOptionsPage(OptionsPage):
             button = QtWidgets.QPushButton(label)
             button.setMaximumHeight(button.fontMetrics().boundingRect(label).height() + 7)
             self.ui.plugins.setItemWidget(item, COLUMN_ACTION, button)
-            if item.is_uninstalled or item.marked_for_update:
+            if item.is_uninstalled:
                 button.setEnabled(False)
 
             if bt_action == PLUGIN_ACTION_INSTALL: