diff --git a/app/views/dashboard/component-edit.blade.php b/app/views/dashboard/component-edit.blade.php
new file mode 100644
index 00000000..40dd345a
--- /dev/null
+++ b/app/views/dashboard/component-edit.blade.php
@@ -0,0 +1,37 @@
+@extends('layout.dashboard')
+
+@section('content')
+<div class="header">
+	<i class="fa fa-list-ul"></i> {{ Lang::get('cachet.dashboard.components') }}
+</div>
+<div class="row">
+	<div class="col-sm-12">
+		<h3>Edit component</h3>
+		@if($savedComponent = Session::get('savedComponent'))
+		<div class='alert alert-{{ $savedComponent->isValid() ? "success" : "danger" }}'>
+			@if($savedComponent->isValid())
+			<strong>Awesome.</strong> Component updated.
+			@else
+			<strong>Whoops.</strong> Something went wrong with the component. {{ $savedComponent->getErrors() }}
+			@endif
+		</div>
+		@endif
+
+		<form name='EditComponentForm' class='form-vertical' role='form' action='/dashboard/components/{{ $component->id }}/edit' method='POST'>
+			<fieldset>
+				<div class='form-group'>
+					<label for='incident-name'>Component Name</label>
+					<input type='text' class='form-control' name='component[name]' id='component-name' required value='{{ $component->name }}' />
+				</div>
+				<div class='form-group'>
+					<label>Description</label>
+					<textarea name='component[description]' class='form-control' rows='5'>{{ $component->description }}</textarea>
+				</div>
+			</fieldset>
+
+			<button type="submit" class="btn btn-primary">Save Component</button>
+			<input type='hidden' name='component[user_id]' value='{{ $component->agent_id || Auth::user()->id }}' />
+		</form>
+	</div>
+</div>
+@stop