diff --git a/app/configuration/controllers/network-controller.html b/app/configuration/controllers/network-controller.html
index 1d59b37..d237d47 100644
--- a/app/configuration/controllers/network-controller.html
+++ b/app/configuration/controllers/network-controller.html
@@ -1,3 +1,4 @@
+<loader loading="loading"></loader>
 <div id="configuration-network">
 	<div class="row column">
 		<h1>BMC network settings</h1>
diff --git a/app/configuration/controllers/network-controller.js b/app/configuration/controllers/network-controller.js
index 3f7cebe..cc803d7 100644
--- a/app/configuration/controllers/network-controller.js
+++ b/app/configuration/controllers/network-controller.js
@@ -23,6 +23,7 @@
       $scope.set_network_success = false;
       $scope.selectedInterface = '';
       $scope.confirm_settings = false;
+      $scope.loading = false;
 
       $scope.selectInterface = function(interfaceId) {
         $scope.interface = $scope.network.interfaces[interfaceId];
@@ -36,6 +37,7 @@
         $scope.confirm_settings = false;
         $scope.set_network_error = '';
         $scope.set_network_success = false;
+        $scope.loading = true;
         var promises = [];
 
         // MAC Address are case-insensitive
@@ -67,13 +69,14 @@
           }
         }
 
-        if (promises.length) {
-          $q.all(promises).finally(function() {
-            if (!$scope.set_network_error) {
-              $scope.set_network_success = true;
-            }
-          });
-        }
+        $q.all(promises).finally(function() {
+          $scope.loading = false;
+          // $q.all with an empty array resolves immediately but don't show
+          // the success message
+          if (!$scope.set_network_error && promises.length) {
+            $scope.set_network_success = true;
+          }
+        });
 
       };