diff --git a/css/tpl-default.css b/css/tpl-default.css
index f81b4ff12..7dc39e119 100644
--- a/css/tpl-default.css
+++ b/css/tpl-default.css
@@ -110,7 +110,7 @@ body {
   background: #fff;
 }
 
-.addresses .panel:hover {
+.addresses .panel:hover, .addresses .panel.selected {
   background: #efefef;
 }
 
diff --git a/index.html b/index.html
index 3bd01f64d..9d0f5f0f5 100644
--- a/index.html
+++ b/index.html
@@ -314,13 +314,12 @@
  
     <!-- ADDRESS -->
     <script type="text/ng-template" id="addresses.html">
-      <div class="addresses" data-ng-controller="AddressesController">
+      <div class="addresses" ng-controller="AddressesController">
         <div ng-show='$root.wallet.publicKeyRing.isComplete()'>
           <div class="row">
             <div class="large-9 medium-12 columns" ng-if="addrInfos[0]">
               <div class="large-8 medium-8 columns">
-                <a class="panel radius db" ng-repeat="addrInfo in addrInfos"
-                  ng-click="selectAddr(addrInfo.address.toString())">
+                <a class="panel radius db" ng-repeat="addrInfo in addrInfos" ng-click="$root.selectedAddr = addrInfo.address.toString()" ng-class="selectAddr('{{addrInfo.address.toString()}}')">
                   <span>{{addrInfo.address.toString()}}</span>
                   <span ng-if="addrInfo.isChange">(change)</span>
                   <span class="right">
diff --git a/js/controllers/addresses.js b/js/controllers/addresses.js
index bba9aced4..a17a44aa2 100644
--- a/js/controllers/addresses.js
+++ b/js/controllers/addresses.js
@@ -1,23 +1,24 @@
 'use strict';
 
 angular.module('copay.addresses').controller('AddressesController',
-  function($scope, $rootScope, controllerUtils) {
+  function($scope, $rootScope, $timeout, controllerUtils) {
     $scope.loading = false;
     var w = $rootScope.wallet;
+
     $scope.newAddr = function() {
-      $scope.loading=true;
+      $scope.loading = true;
       w.generateAddress(null, function() {
-        setTimeout(function() {
+        $timeout(function() {
           controllerUtils.setSocketHandlers();
           controllerUtils.updateAddressList();
-          $scope.loading=false;
+          $rootScope.selectedAddr = $rootScope.addrInfos[0].address.toString();
+          $scope.loading = false;
           $rootScope.$digest();
         },1);
       });
     };
 
-    $scope.selectAddr = function(addr) {
-      $scope.selectedAddr = addr;
+    $scope.selectAddr = function (addr) {
+      return addr === $rootScope.selectedAddr ? 'selected' : '';
     };
-
   });