diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11c99ea87..3f44a13c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - [Tables] Filter input now always shows up even if the table is empty [#3295](https://github.com/vatesfr/xen-orchestra/issues/3295) (PR [#3296](https://github.com/vatesfr/xen-orchestra/pull/3296))
 - [Tasks] The table is now still shown when there are no tasks (PR [#3305](https://github.com/vatesfr/xen-orchestra/pull/3305))
 - [Host / Logs] Homogenize action buttons in table and enable bulk deletion [#3179](https://github.com/vatesfr/xen-orchestra/issues/3179) (PR [#3313](https://github.com/vatesfr/xen-orchestra/pull/3313))
+- [VM/Advanced] Change "Convert" to "Convert to template" and always show the button [#3201](https://github.com/vatesfr/xen-orchestra/issues/3201) (PR [#3319](https://github.com/vatesfr/xen-orchestra/pull/3319))
 
 ### Bug fixes
 
diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js
index fa8d228aa..5cb914e6e 100644
--- a/packages/xo-web/src/common/intl/messages.js
+++ b/packages/xo-web/src/common/intl/messages.js
@@ -984,7 +984,7 @@ const messages = {
 
   // ----- VM advanced tab -----
   vmRemoveButton: 'Remove',
-  vmConvertButton: 'Convert',
+  vmConvertToTemplateButton: 'Convert to template',
   vmShareButton: 'Share',
   xenSettingsLabel: 'Xen settings',
   guestOsLabel: 'Guest OS',
diff --git a/packages/xo-web/src/xo-app/vm/tab-advanced.js b/packages/xo-web/src/xo-app/vm/tab-advanced.js
index b67bbc09a..8b639678b 100644
--- a/packages/xo-web/src/xo-app/vm/tab-advanced.js
+++ b/packages/xo-web/src/xo-app/vm/tab-advanced.js
@@ -342,14 +342,6 @@ export default class TabAdvanced extends Component {
                   icon='vm-clone'
                   labelId='cloneVmLabel'
                 />
-                <TabButton
-                  btnStyle='danger'
-                  handler={convertVmToTemplate}
-                  handlerParam={vm}
-                  icon='vm-create-template'
-                  labelId='vmConvertButton'
-                  redirectOnSuccess='/'
-                />
               </span>
             )}
             {vm.power_state === 'Suspended' && (
@@ -370,6 +362,15 @@ export default class TabAdvanced extends Component {
                 />
               </span>
             )}
+            <TabButton
+              btnStyle='danger'
+              disabled={vm.power_state !== 'Halted'}
+              handler={convertVmToTemplate}
+              handlerParam={vm}
+              icon='vm-create-template'
+              labelId='vmConvertToTemplateButton'
+              redirectOnSuccess='/'
+            />
             <TabButton
               btnStyle='danger'
               handler={deleteVm}