diff --git a/resources/lang/da/forms.php b/resources/lang/da/forms.php
index a671f9c1..be06567d 100755
--- a/resources/lang/da/forms.php
+++ b/resources/lang/da/forms.php
@@ -63,6 +63,7 @@ return [
         'link'        => 'Link',
         'tags'        => 'Tags',
         'tags-help'   => 'Komma adskilt.',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => 'Navn',
diff --git a/resources/lang/de/forms.php b/resources/lang/de/forms.php
index c9438590..3535a5d2 100755
--- a/resources/lang/de/forms.php
+++ b/resources/lang/de/forms.php
@@ -63,6 +63,7 @@ return [
         'link'        => 'Link',
         'tags'        => 'Schlagwörter',
         'tags-help'   => 'Durch Kommata trennen.',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => 'Name',
diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
index fd6611ee..8b7478a0 100755
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -63,6 +63,7 @@ return [
         'link'        => 'Link',
         'tags'        => 'Tags',
         'tags-help'   => 'Comma separated.',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => 'Name',
diff --git a/resources/lang/es/forms.php b/resources/lang/es/forms.php
index 85953387..24834110 100755
--- a/resources/lang/es/forms.php
+++ b/resources/lang/es/forms.php
@@ -56,6 +56,7 @@ return [
         'link'        => 'Enlace',
         'tags'        => 'Etiquetas',
         'tags-help'   => 'Separado por comas.',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => 'Nombre',
diff --git a/resources/lang/fr/forms.php b/resources/lang/fr/forms.php
index 9315ee01..6d8bbaa5 100755
--- a/resources/lang/fr/forms.php
+++ b/resources/lang/fr/forms.php
@@ -63,6 +63,7 @@ return [
         'link'        => 'Lien',
         'tags'        => 'Mots clés',
         'tags-help'   => 'séparé par des virgules.',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => 'Nom',
diff --git a/resources/lang/id/forms.php b/resources/lang/id/forms.php
index 53b99451..bbeead19 100755
--- a/resources/lang/id/forms.php
+++ b/resources/lang/id/forms.php
@@ -63,6 +63,7 @@ return [
         'link'        => 'Link',
         'tags'        => 'Tag',
         'tags-help'   => 'Pisahkan dengan koma.',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => 'Nama',
diff --git a/resources/lang/it/forms.php b/resources/lang/it/forms.php
index fadbce4d..616c3c48 100644
--- a/resources/lang/it/forms.php
+++ b/resources/lang/it/forms.php
@@ -63,6 +63,7 @@ return [
         'link'        => 'Link',
         'tags'        => 'Tags',
         'tags-help'   => 'Separati da virgola.',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => 'Nome',
diff --git a/resources/lang/ko/forms.php b/resources/lang/ko/forms.php
index 2ad399db..c8b620d4 100755
--- a/resources/lang/ko/forms.php
+++ b/resources/lang/ko/forms.php
@@ -63,6 +63,7 @@ return [
         'link'        => '링크',
         'tags'        => '태그',
         'tags-help'   => '쉼표로 구분.',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => '이름',
diff --git a/resources/lang/nl/forms.php b/resources/lang/nl/forms.php
index 38daf31d..20a02df6 100755
--- a/resources/lang/nl/forms.php
+++ b/resources/lang/nl/forms.php
@@ -63,6 +63,7 @@ return [
         'link'        => 'Link',
         'tags'        => 'Tags',
         'tags-help'   => 'Komma gescheiden.',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => 'Naam',
diff --git a/resources/lang/pl/forms.php b/resources/lang/pl/forms.php
index 4fec1273..09a22577 100755
--- a/resources/lang/pl/forms.php
+++ b/resources/lang/pl/forms.php
@@ -57,6 +57,7 @@ return [
         'link'        => 'Link',
         'tags'        => 'Tagi',
         'tags-help'   => 'Rozdzielone przecinkiem.',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => 'Nazwa',
diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php
index 3d02f915..adc593a5 100755
--- a/resources/lang/pt-BR/forms.php
+++ b/resources/lang/pt-BR/forms.php
@@ -63,6 +63,7 @@ return [
         'link'        => 'Link',
         'tags'        => 'Marcações',
         'tags-help'   => 'Separados por vírgulas.',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => 'Nome',
diff --git a/resources/lang/ru/forms.php b/resources/lang/ru/forms.php
index d969c880..bd7bba7b 100644
--- a/resources/lang/ru/forms.php
+++ b/resources/lang/ru/forms.php
@@ -63,6 +63,7 @@ return [
         'link'        => 'Ссылка',
         'tags'        => 'Теги',
         'tags-help'   => 'Разделитель - запятые.',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => 'Название',
diff --git a/resources/lang/zh-CN/forms.php b/resources/lang/zh-CN/forms.php
index 1dfa0073..6f617455 100755
--- a/resources/lang/zh-CN/forms.php
+++ b/resources/lang/zh-CN/forms.php
@@ -63,6 +63,7 @@ return [
         'link'        => '链接',
         'tags'        => '标签',
         'tags-help'   => '以逗号分隔。',
+        'enabled'     => 'Component enabled?',
 
         'groups' => [
             'name' => '组名',
diff --git a/resources/views/dashboard/components/add.blade.php b/resources/views/dashboard/components/add.blade.php
index abf6bb69..baf29f8c 100644
--- a/resources/views/dashboard/components/add.blade.php
+++ b/resources/views/dashboard/components/add.blade.php
@@ -56,6 +56,13 @@
                             <input name="component[tags]" class="form-control">
                             <span class="help-block">{{ trans('forms.components.tags-help') }}</span>
                         </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="hidden" value="0" name="component[enabled]">
+                                <input type="checkbox" value="1" name="component[enabled]" checked>
+                                {{ trans('forms.components.enabled') }}
+                            </label>
+                        </div>
                     </fieldset>
 
                     <input type="hidden" name="component[order]" value="0">
diff --git a/resources/views/dashboard/components/edit.blade.php b/resources/views/dashboard/components/edit.blade.php
index c4295731..48fba310 100644
--- a/resources/views/dashboard/components/edit.blade.php
+++ b/resources/views/dashboard/components/edit.blade.php
@@ -56,6 +56,13 @@
                             <input name="component[tags]" class="form-control" value="{{ $component->tagsList }}">
                             <span class="help-block">{{ trans('forms.components.tags-help') }}</span>
                         </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="hidden" value="0" name="component[enabled]">
+                                <input type="checkbox" value="1" name="component[enabled]" {{ $component->enabled ? "checked" : null }}>
+                                {{ trans('forms.components.enabled') }}
+                            </label>
+                        </div>
                     </fieldset>
 
                     <input type="hidden" name="component[user_id]" value="{{ $component->agent_id || $current_user->id }}">
diff --git a/resources/views/dashboard/components/index.blade.php b/resources/views/dashboard/components/index.blade.php
index b0449a30..d4a1970e 100644
--- a/resources/views/dashboard/components/index.blade.php
+++ b/resources/views/dashboard/components/index.blade.php
@@ -18,7 +18,7 @@
             <div class="row">
                 <div class="col-sm-12 striped-list" id="component-list">
                     @forelse($components as $component)
-                    <div class="row striped-list-item" data-component-id="{{ $component->id }}">
+                    <div class="row striped-list-item {{ !$component->enabled ? 'bg-warning' : null }}" data-component-id="{{ $component->id }}">
                         <div class="col-xs-6">
                             <h4>
                                 @if($components->count() > 1)