diff --git a/src/Mod/AddonManager/AddonManager.py b/src/Mod/AddonManager/AddonManager.py
index 3bd5f36d47..a7eb7310d1 100644
--- a/src/Mod/AddonManager/AddonManager.py
+++ b/src/Mod/AddonManager/AddonManager.py
@@ -123,6 +123,7 @@ class CommandAddonManager:
         self.dialog.buttonInstall.setIcon(QtGui.QIcon.fromTheme("download",QtGui.QIcon(":/icons/edit_OK.svg")))
         self.dialog.buttonUpdateAll.setIcon(QtGui.QIcon(":/icons/button_valid.svg"))
         self.dialog.buttonConfigure.setIcon(QtGui.QIcon(":/icons/preferences-system.svg"))
+        self.dialog.buttonClose.setIcon(QtGui.QIcon.fromTheme("close",QtGui.QIcon(":/icons/process-stop.svg")))
         self.dialog.tabWidget.setTabIcon(0,QtGui.QIcon.fromTheme("folder",QtGui.QIcon(":/icons/folder.svg")))
         self.dialog.tabWidget.setTabIcon(1,QtGui.QIcon(":/icons/applications-python.svg"))
 
@@ -143,6 +144,7 @@ class CommandAddonManager:
         self.dialog.tabWidget.currentChanged.connect(self.switchtab)
         self.dialog.listMacros.currentRowChanged.connect(self.show_macro)
         self.dialog.buttonConfigure.clicked.connect(self.show_config)
+        self.dialog.buttonClose.clicked.connect(self.dialog.reject)
 
         # allow to open links in browser
         self.dialog.description.setOpenLinks(True)
diff --git a/src/Mod/AddonManager/AddonManager.ui b/src/Mod/AddonManager/AddonManager.ui
index a982168d62..3f2f862983 100644
--- a/src/Mod/AddonManager/AddonManager.ui
+++ b/src/Mod/AddonManager/AddonManager.ui
@@ -151,6 +151,19 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QPushButton" name="buttonClose">
+       <property name="toolTip">
+        <string>Close the addons manager</string>
+       </property>
+       <property name="text">
+        <string>Close</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>