diff --git a/src/xo-app/vm/tab-disks.js b/src/xo-app/vm/tab-disks.js
index 63b1206b5..7f3159193 100644
--- a/src/xo-app/vm/tab-disks.js
+++ b/src/xo-app/vm/tab-disks.js
@@ -30,6 +30,7 @@ import {
   disconnectVbd,
   editVdi,
   isSrWritable,
+  isVmRunning,
   migrateVdi,
   setBootableVbd,
   setVmBootOrder
@@ -445,7 +446,7 @@ export default class TabDisks extends Component {
                               {_('vbdStatusDisconnected')}
                           </span>
                           <ButtonGroup className='pull-xs-right'>
-                            {vm.power_state === 'Running' &&
+                            {isVmRunning(vm) &&
                               <ActionRowButton
                                 btnStyle='default'
                                 icon='connect'
diff --git a/src/xo-app/vm/tab-network.js b/src/xo-app/vm/tab-network.js
index a0126f7f6..f04ec9211 100644
--- a/src/xo-app/vm/tab-network.js
+++ b/src/xo-app/vm/tab-network.js
@@ -22,7 +22,8 @@ import {
   connectVif,
   createVmInterface,
   deleteVif,
-  disconnectVif
+  disconnectVif,
+  isVmRunning
 } from 'xo'
 
 @propTypes({
@@ -191,11 +192,13 @@ export default class TabNetwork extends Component {
                               {_('vifStatusDisconnected')}
                             </span>
                             <ButtonGroup className='pull-xs-right'>
-                              <ActionRowButton
-                                icon='connect'
-                                handler={connectVif}
-                                handlerParam={vif}
-                              />
+                              {isVmRunning(vm) &&
+                                <ActionRowButton
+                                  icon='connect'
+                                  handler={connectVif}
+                                  handlerParam={vif}
+                                />
+                              }
                               <ActionRowButton
                                 icon='remove'
                                 handler={deleteVif}