diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 06acc16583a..27e0e4f962c 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -2106,7 +2106,8 @@
         } else if (jsonObj.state == 'Running') {
             allowedActions.push("stop");
             allowedActions.push("restart");
-            allowedActions.push("snapshot");
+            if (jsonObj.hypervisor != 'KVM' || g_KVMsnapshotenabled == true)
+                allowedActions.push("snapshot");
             allowedActions.push("destroy");            
             allowedActions.push("reset");
              
@@ -2135,7 +2136,8 @@
             allowedActions.push("start");
             allowedActions.push("destroy");
             allowedActions.push("reset");
-            allowedActions.push("snapshot");
+            if (jsonObj.hypervisor != 'KVM' || g_KVMsnapshotenabled == true)
+                allowedActions.push("snapshot");
             allowedActions.push("scaleUp");  //when vm is stopped, scaleUp is supported for all hypervisors 
             allowedActions.push("changeAffinity");
 
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 03b88f82d9c..4875662d99a 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -1896,7 +1896,7 @@
 
         if (jsonObj.hypervisor != "Ovm" && jsonObj.state == "Ready") {        	
         	if (jsonObj.hypervisor == 'KVM') { 
-        		if (json.vmstate == 'Running') {        			
+        		if (jsonObj.vmstate == 'Running') {        			
         			if (g_KVMsnapshotenabled == true) { //"kvm.snapshot.enabled" flag should be taken to account only when snapshot is being created for Running vm (CLOUDSTACK-4428)
             			allowedActions.push("takeSnapshot");
         	            allowedActions.push("recurringSnapshot");