diff --git a/app/Http/Controllers/Admin/IncidentController.php b/app/Http/Controllers/Admin/IncidentController.php
index 6fb5578d..92b51320 100644
--- a/app/Http/Controllers/Admin/IncidentController.php
+++ b/app/Http/Controllers/Admin/IncidentController.php
@@ -323,6 +323,13 @@ class IncidentController extends AbstractController
                 ->with('errors', $incident->getErrors());
         }
 
+        $componentStatus = array_pull($incidentData, 'component_status');
+        if ($incident->component) {
+            $incident->component->update([
+                'status' => $componentStatus,
+            ]);
+        }
+
         segment_track('Dashboard', [
             'event'   => 'Edited Incident',
             'success' => true,
diff --git a/resources/views/dashboard/incidents/edit.blade.php b/resources/views/dashboard/incidents/edit.blade.php
index cd4874ac..c1e43379 100644
--- a/resources/views/dashboard/incidents/edit.blade.php
+++ b/resources/views/dashboard/incidents/edit.blade.php
@@ -51,6 +51,23 @@
                                 <option value='0' {{ $incident->visible === 0 ? 'selected' : null }}>{{ trans('forms.incidents.logged_in_only') }}</option>
                             </select>
                         </div>
+                        @if($incident->component)
+                        <div class="form-group" id='component-status'>
+                            <div class="well">
+                                <strong>{{ $incident->component->name }}</strong>
+                                <div class="radio-items">
+                                    @foreach(trans('cachet.components.status') as $statusID => $status)
+                                    <div class="radio-inline">
+                                        <label>
+                                            <input type="radio" name="incident[component_status]" value="{{ $statusID }}" {{ $incident->component->status == $statusID ? "checked='checked'" : "" }}>
+                                            {{ $status }}
+                                        </label>
+                                    </div>
+                                    @endforeach
+                                </div>
+                            </div>
+                        </div>
+                        @endif
                         <div class="form-group">
                             <label>{{ trans('forms.incidents.message') }}</label>
                             <div class='markdown-control'>