diff --git a/app/configuration/controllers/network-controller.html b/app/configuration/controllers/network-controller.html
index f6d0a5d..7a24671 100644
--- a/app/configuration/controllers/network-controller.html
+++ b/app/configuration/controllers/network-controller.html
@@ -77,10 +77,10 @@
 				<div class="column small-12 large-4">
 						<!-- Call Nameservers "DNS Servers" on the GUI -->
 						<fieldset class="net-config__static-ip-wrap" ng-repeat="dns in interface.Nameservers track by $index">
-							<label for="net-config__prime-dns">DNS Server {{$index+1}}</label>
-							<input id="net-config__prime-dns" type="text" ng-model="dns" ng-blur="interface.Nameservers[$index] = dns"/>
+							<label for="net-config__prime-dns{{$index+1}}">DNS Server {{$index+1}}</label>
+							<input id="net-config__prime-dns{{$index+1}}" type="text" ng-model="dns" ng-blur="interface.Nameservers[$index] = dns" set-focus-dns-field/>
 						</fieldset>
-						<button type="button" class="btn-primary inline" ng-click="interface.Nameservers.push('');">Add new DNS server</button>
+						<button type="button" class="btn-primary inline" ng-click="addDNSField()">Add new DNS server</button>
 				</div>
 			</fieldset>
 			<div class="network-config__submit-wrapper">
diff --git a/app/configuration/controllers/network-controller.js b/app/configuration/controllers/network-controller.js
index 9714931..9905157 100644
--- a/app/configuration/controllers/network-controller.js
+++ b/app/configuration/controllers/network-controller.js
@@ -9,6 +9,21 @@
 window.angular && (function(angular) {
   'use strict';
 
+  angular.module('app.configuration').directive('setFocusDnsField', function() {
+    return function(scope, element, attrs) {
+      var elem = window.document.getElementById(element[0].id);
+      // Focus on the newly created DNS server field
+      // Since this directive is also called when initializing DNS server fields
+      // on a page load, need to determine if the call is from a page load or
+      // from the user pressing the "Add new DNS server" button. The easiest way
+      // to do this is to check if the field is empty, if it is we know
+      // this is a new field since all empty fields are removed from the array.
+      if (!scope[attrs.ngModel] && elem) {
+        elem.focus();
+      }
+    };
+  });
+
   angular.module('app.configuration').controller('networkController', [
     '$scope', '$window', 'APIUtils', 'dataService', '$timeout', '$route', '$q',
     function($scope, $window, APIUtils, dataService, $timeout, $route, $q) {
@@ -34,6 +49,11 @@
         $scope.selectedInterface = interfaceId;
         $scope.networkDevice = false;
       };
+
+      $scope.addDNSField = function() {
+        $scope.interface.Nameservers.push('');
+      };
+
       $scope.setNetworkSettings = function() {
         // Hides the confirm network settings modal
         $scope.confirm_settings = false;