diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php
index 5cf4470129..e64f57a634 100755
--- a/app/controllers/admin/ModelsController.php
+++ b/app/controllers/admin/ModelsController.php
@@ -374,6 +374,14 @@ class ModelsController extends AdminController
         return $view;
 
     }
+    
+    
+    public function getCustomFields($modelId)
+    {
+      $model=Model::find($modelId);
+      return View::make("backend.models.custom_fields_form")->with("model",$model);
+    }
+
 
 
     /**
diff --git a/app/routes.php b/app/routes.php
index 78cb344dbf..d4cc5c31bd 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -218,6 +218,7 @@
                 Route::get( '{modelId}/delete', [ 'as' => 'delete/model', 'uses' => 'ModelsController@getDelete' ] );
                 Route::get( '{modelId}/view', [ 'as' => 'view/model', 'uses' => 'ModelsController@getView' ] );
                 Route::get( '{modelID}/restore', [ 'as' => 'restore/model', 'uses' => 'ModelsController@getRestore' ] );
+                Route::get( '{modelId}/custom_fields',['as' => 'custom_fields/model','uses' => 'ModelsController@getCustomFields']);
             } );
 
             Route::get( '/', [
diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php
index 9ae8623620..167e927601 100755
--- a/app/views/backend/hardware/edit.blade.php
+++ b/app/views/backend/hardware/edit.blade.php
@@ -311,18 +311,12 @@
 				</div>
 		  	</div>
 
+        <div id='custom_fields_content'>
         <!-- Custom Fields -->
         @if($asset->model && $asset->model->fieldset)
-          <h1>Custom Fields</h1>
-          @foreach($asset->model->fieldset->fields AS $field)
-            <div class="form-group">
-              <label for="idunno" class="col-md-2 control-label">{{{ $field->name }}}</label>
-              <div class="col-md-7 col-sm-12">
-                  <input type="text" value="{{{ Input::old('fields[{{$field->db_column_name()}}]',$asset->{$field->db_column_name()}) }}}" name="fields[{{{ $field->db_column_name() }}}]">
-              </div>
-            </div>
-          @endforeach
+          @include("backend.models.custom_fields_form",["model" => $asset->model])
         @endif
+      </div>
 
 
             <!-- Image -->
@@ -363,7 +357,17 @@
 
 	
 
-
+$(function() {
+  $('#model_select_id').on("change",function () {
+    // console.warn("Model Id has changed!");
+    var modelid=$('#model_select_id').val();
+    console.warn("Model ID is: "+modelid);
+    $.get("/hardware/models/"+modelid+"/custom_fields",{_token: "{{ csrf_token() }}"},function (data) {
+      // console.warn("Ajax call came back okay! Data is: "+data);
+      $('#custom_fields_content').html(data);
+    })
+  });
+});
 
     $(function() {
         user_add($(".status_id option:selected").val());
@@ -467,7 +471,6 @@ $(function () {
 
     data._token =  '{{ csrf_token() }}',
     //console.dir(data);
-    data._token =  '{{ csrf_token() }}',
 
     $.post("{{Config::get('app.url')}}/api/"+model+"s",data,function (result) {
       var id=result.id;
diff --git a/app/views/backend/models/custom_fields_form.blade.php b/app/views/backend/models/custom_fields_form.blade.php
new file mode 100644
index 0000000000..27dc46da76
--- /dev/null
+++ b/app/views/backend/models/custom_fields_form.blade.php
@@ -0,0 +1,13 @@
+@if($model->fieldset)
+<h1>Custom Fields</h1>
+@foreach($model->fieldset->fields AS $field)
+  <div class="form-group">
+    <label for="idunno" class="col-md-2 control-label">{{{ $field->name }}}</label>
+    <div class="col-md-7 col-sm-12">
+        <input type="text" value="{{{ Input::old('fields[{{$field->db_column_name()}}]',(isset($asset) ? $asset->{$field->db_column_name()} : "")) }}}" name="fields[{{{ $field->db_column_name() }}}]">
+    </div>
+  </div>
+@endforeach
+@else
+No Custom Fields Defined
+@endif