diff --git a/app/portainer/models/template.js b/app/portainer/models/template.js
index 0218ce8a2..6b9509958 100644
--- a/app/portainer/models/template.js
+++ b/app/portainer/models/template.js
@@ -25,7 +25,7 @@ function TemplateCreateRequest(model) {
   this.Image = model.Image;
   this.Registry = model.Registry.URL;
   this.Command = model.Command;
-  this.Network = model.Network;
+  this.Network = model.Network && model.Network.Name;
   this.Privileged = model.Privileged;
   this.Interactive = model.Interactive;
   this.RestartPolicy = model.RestartPolicy;
diff --git a/app/portainer/views/templates/edit/templateController.js b/app/portainer/views/templates/edit/templateController.js
index ccf82d228..352764e43 100644
--- a/app/portainer/views/templates/edit/templateController.js
+++ b/app/portainer/views/templates/edit/templateController.js
@@ -38,6 +38,12 @@ function ($q, $scope, $state, $transition$, TemplateService, TemplateHelper, Net
       )
     })
     .then(function success(data) {
+      var template = data.template;
+      if (template.Network) {
+        template.Network = _.find(data.networks, function(o) { return o.Name === template.Network; });
+      } else {
+        template.Network = _.find(data.networks, function(o) { return o.Name === 'bridge'; });
+      }
       $scope.categories = TemplateHelper.getUniqueCategories(data.templates);
       $scope.template = data.template;
       $scope.networks = data.networks;