diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index 944cc95f75..8eed6a70c0 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -1490,44 +1490,52 @@ angular.module('ionic.ui.radio', [])
     transclude: true,
     template: '<div class="button-bar button-bar-inline" ng-transclude></div>',
 
+    controller: ['$scope', '$element', function($scope, $element) {
+
+      this.select = function(element) {
+        var c, children = $element.children();
+        for(var i = 0; i < children.length; i++) {
+          c = children[i];
+          if(c != element[0]) {
+            c.classList.remove('active');
+          }
+        }
+      };
+
+    }],
+
     link: function($scope, $element, $attr, ngModel) {
       var radio;
 
-
       if(ngModel) {
         //$element.bind('tap', tapHandler);
 
         ngModel.$render = function() {
-          var val = $scope.$eval($attr.ngValue);
-          if(val === ngModel.$viewValue) {
-          } else {
-          }
-        };
-        $scope.$parent.$on('button.toggled', function(e, element) {
-          var c, children = $element.children();
+          var children = $element.children();
           for(var i = 0; i < children.length; i++) {
-            c = children[i];
-            if(c != element[0]) {
-              c.classList.remove('active');
-            }
+            children[i].classList.remove('active');
           }
-        });
+          $scope.$parent.$broadcast('radioButton.select', ngModel.$viewValue);
+        };
       }
     }
   };
 })
 
-.directive('button', function() {
+.directive('buttonRadio', function() {
   return {
-    restrict: 'E',
-    require: '?^ngModel',
-    link: function($scope, $element, $attr, ngModel) {
-      if(!ngModel) { return; }
+    restrict: 'CA',
+    require: ['?^ngModel', '?^radioButtons'],
+    link: function($scope, $element, $attr, ctrls) {
+      var ngModel = ctrls[0];
+      var radioButtons = ctrls[1];
+      if(!ngModel || !radioButtons) { return; }
 
       var setIt = function() {
         $element.addClass('active');
         ngModel.$setViewValue($scope.$eval($attr.ngValue));
-        $scope.$emit('button.toggled', $element);
+
+        radioButtons.select($element);
       };
 
       $scope.tapHandler = function(e) {
@@ -1538,6 +1546,12 @@ angular.module('ionic.ui.radio', [])
       var clickHandler = function(e) {
         setIt();
       };
+
+      $scope.$on('radioButton.select', function(e, val) {
+        if(val == $scope.$eval($attr.ngValue)) {
+          $element.addClass('active');
+        };
+      });
         
       $element.bind('click', clickHandler);
     }
diff --git a/js/ext/angular/src/directive/ionicRadio.js b/js/ext/angular/src/directive/ionicRadio.js
index ae50cec33c..c46911d8d7 100644
--- a/js/ext/angular/src/directive/ionicRadio.js
+++ b/js/ext/angular/src/directive/ionicRadio.js
@@ -70,44 +70,52 @@ angular.module('ionic.ui.radio', [])
     transclude: true,
     template: '<div class="button-bar button-bar-inline" ng-transclude></div>',
 
+    controller: ['$scope', '$element', function($scope, $element) {
+
+      this.select = function(element) {
+        var c, children = $element.children();
+        for(var i = 0; i < children.length; i++) {
+          c = children[i];
+          if(c != element[0]) {
+            c.classList.remove('active');
+          }
+        }
+      };
+
+    }],
+
     link: function($scope, $element, $attr, ngModel) {
       var radio;
 
-
       if(ngModel) {
         //$element.bind('tap', tapHandler);
 
         ngModel.$render = function() {
-          var val = $scope.$eval($attr.ngValue);
-          if(val === ngModel.$viewValue) {
-          } else {
-          }
-        };
-        $scope.$parent.$on('button.toggled', function(e, element) {
-          var c, children = $element.children();
+          var children = $element.children();
           for(var i = 0; i < children.length; i++) {
-            c = children[i];
-            if(c != element[0]) {
-              c.classList.remove('active');
-            }
+            children[i].classList.remove('active');
           }
-        });
+          $scope.$parent.$broadcast('radioButton.select', ngModel.$viewValue);
+        };
       }
     }
   };
 })
 
-.directive('button', function() {
+.directive('buttonRadio', function() {
   return {
-    restrict: 'E',
-    require: '?^ngModel',
-    link: function($scope, $element, $attr, ngModel) {
-      if(!ngModel) { return; }
+    restrict: 'CA',
+    require: ['?^ngModel', '?^radioButtons'],
+    link: function($scope, $element, $attr, ctrls) {
+      var ngModel = ctrls[0];
+      var radioButtons = ctrls[1];
+      if(!ngModel || !radioButtons) { return; }
 
       var setIt = function() {
         $element.addClass('active');
         ngModel.$setViewValue($scope.$eval($attr.ngValue));
-        $scope.$emit('button.toggled', $element);
+
+        radioButtons.select($element);
       };
 
       $scope.tapHandler = function(e) {
@@ -118,6 +126,12 @@ angular.module('ionic.ui.radio', [])
       var clickHandler = function(e) {
         setIt();
       };
+
+      $scope.$on('radioButton.select', function(e, val) {
+        if(val == $scope.$eval($attr.ngValue)) {
+          $element.addClass('active');
+        };
+      });
         
       $element.bind('click', clickHandler);
     }
diff --git a/js/ext/angular/test/radioButton.html b/js/ext/angular/test/radioButton.html
index ee17aa2f24..be968cbf4e 100644
--- a/js/ext/angular/test/radioButton.html
+++ b/js/ext/angular/test/radioButton.html
@@ -21,13 +21,15 @@
     </header>
     <content has-header="true"class="reveal-animation">
       <div ng-controller="TestCtrl">
+
         <radio-buttons ng-model="data.isLovely">
-          <button class="button button-assertive" ng-value="'magical'">Magical</button>
-          <button class="button button-assertive" ng-value="'black'">Black</button>
-          <button class="button button-assertive" ng-value="'pinto'">Pinto</button>
+          <button class="button button-assertive button-radio" ng-value="'magical'">Magical</button>
+          <button class="button button-assertive button-radio" ng-value="'black'">Black</button>
+          <button class="button button-assertive button-radio" ng-value="'pinto'">Pinto</button>
         </radio-buttons>
 
         <form>
+          <button ng-click="cycle()" class="button button-warning">Cycle</button>
           <button ng-click="doIt()" class="button button-warning">Print</button>
         </form>
       </div>