diff --git a/src/plugins/components/PluginSettings/PluginSettings.tsx b/src/plugins/components/PluginSettings/PluginSettings.tsx
index 468e57221..fc2cb9c81 100644
--- a/src/plugins/components/PluginSettings/PluginSettings.tsx
+++ b/src/plugins/components/PluginSettings/PluginSettings.tsx
@@ -21,8 +21,8 @@ interface PluginSettingsProps {
 
 const styles = createStyles({
   item: {
-    paddingBottom: 5,
-    paddingTop: 5
+    paddingBottom: 10,
+    paddingTop: 10
   }
 });
 
@@ -57,7 +57,11 @@ const PluginSettings = withStyles(styles, { name: "PluginSettings" })(
               )}
               {configuration.type === "BOOLEAN" && (
                 <ControlledSwitch
-                  checked={configuration.value === "true"}
+                  checked={
+                    typeof configuration.value !== "boolean"
+                      ? configuration.value === "true"
+                      : configuration.value
+                  }
                   label={configuration.label}
                   name={configuration.name}
                   onChange={onChange}
diff --git a/src/plugins/components/PluginsDetailsPage/PluginsDetailsPage.tsx b/src/plugins/components/PluginsDetailsPage/PluginsDetailsPage.tsx
index e1808b310..7867faca5 100644
--- a/src/plugins/components/PluginsDetailsPage/PluginsDetailsPage.tsx
+++ b/src/plugins/components/PluginsDetailsPage/PluginsDetailsPage.tsx
@@ -50,6 +50,7 @@ const PageDetailsPage: React.StatelessComponent<PageDetailsPageProps> = ({
     description: maybe(() => plugin.description, ""),
     name: maybe(() => plugin.name, "")
   };
+
   return (
     <Form errors={errors} initial={initialForm} onSubmit={onSubmit}>
       {({ data, errors, hasChanged, submit, set, triggerChange }) => {
@@ -63,7 +64,6 @@ const PageDetailsPage: React.StatelessComponent<PageDetailsPageProps> = ({
           name === "active"
             ? (newData.active = value)
             : (newData.active = data.active);
-
           newData.configuration.map(item => {
             if (item.name === name) {
               item.value = value;