diff --git a/plugins/ktcore/admin/documentFieldsv2.php b/plugins/ktcore/admin/documentFieldsv2.php
index 99041e3..bb1e149 100644
--- a/plugins/ktcore/admin/documentFieldsv2.php
+++ b/plugins/ktcore/admin/documentFieldsv2.php
@@ -66,7 +66,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
 
         $oTemplate->setData(array(
 		    'context' => $this,
-            'fieldsets' => KTFieldset::getList('disabled != true'),
+            'fieldsets' => KTFieldset::getList("disabled != true AND namespace != 'tagcloud'"),
         ));
         return $oTemplate;
     }
diff --git a/plugins/ktcore/admin/plugins.php b/plugins/ktcore/admin/plugins.php
index 162684f..8bc4231 100755
--- a/plugins/ktcore/admin/plugins.php
+++ b/plugins/ktcore/admin/plugins.php
@@ -75,6 +75,33 @@ class KTPluginDispatcher extends KTAdminDispatcher {
         $sTable = KTUtil::getTableName('plugins');
         $aIds = (array) KTUtil::arrayGet($_REQUEST, 'pluginids');
         KTPluginEntity::setEnabled($aIds);
+        //enabling or disabling Tag fieldset depending on whether tag cloud plugin is enabled or disabled.
+        //Get tag cloud object
+        $oTagClouPlugin = KTPluginEntity::getByNamespace('ktcore.tagcloud.plugin');
+        if($oTagClouPlugin->getDisabled() == '1')
+        {
+        	//disable tag fieldset
+        	$aFV = array(
+                'disabled' => true,
+            );
+            $aWFV = array(
+                'namespace' => 'tagcloud'
+            );
+        	$res = DBUtil::whereUpdate('fieldsets', $aFV, $aWFV);	
+        }
+        //if Tag Cloud plugin disabled
+        if($oTagClouPlugin->getDisabled() == '0')
+        {
+        	//enable tag fieldset
+        	$aFV = array(
+                'disabled' => false,
+            );
+            $aWFV = array(
+                'namespace' => 'tagcloud'
+            );
+        	$res = DBUtil::whereUpdate('fieldsets', $aFV, $aWFV);	
+        }
+        
         $this->successRedirectToMain(_kt('Plugins updated'));
     }