diff --git a/src/accordion/accordion.js b/src/accordion/accordion.js
index e6c2e96dc9..be094a77bc 100644
--- a/src/accordion/accordion.js
+++ b/src/accordion/accordion.js
@@ -76,7 +76,8 @@ angular.module('ui.bootstrap.accordion', ['ui.bootstrap.collapse'])
       accordionCtrl.addGroup(scope);
 
       scope.openClass = attrs.openClass || 'panel-open';
-      scope.panelClass = attrs.panelClass;
+      scope.panelClass = attrs.panelClass || 'panel-default';
+      element.addClass(scope.panelClass);
       scope.$watch('isOpen', function(value) {
         element.toggleClass(scope.openClass, !!value);
         if (value) {
diff --git a/src/accordion/test/accordion.spec.js b/src/accordion/test/accordion.spec.js
index 31dd983ef5..f80e7e1453 100644
--- a/src/accordion/test/accordion.spec.js
+++ b/src/accordion/test/accordion.spec.js
@@ -426,6 +426,29 @@ describe('uib-accordion', function() {
       });
     });
 
+    describe('is-open attribute with custom class', function() {
+      beforeEach(function() {
+        var tpl =
+          '<uib-accordion>' +
+            '<uib-accordion-group ng-repeat="group in groups" heading="{{group.name}}" is-open="group.open" class="testClass">{{group.content}}</uib-accordion-group>' +
+          '</uib-accordion>';
+        element = angular.element(tpl);
+        scope.groups = [
+          {name: 'title 1', content: 'Content 1', open: false},
+          {name: 'title 2', content: 'Content 2', open: true}
+        ];
+        $compile(element)(scope);
+        scope.$digest();
+
+        groups = element.find('.panel');
+      });
+
+      it('should add "panel-open" class', function(){
+        expect(groups.eq(0)).not.toHaveClass('panel-open');
+        expect(groups.eq(1)).toHaveClass('panel-open');
+      });
+    });
+
     describe('`is-disabled` attribute', function() {
       var groupBody;
       beforeEach(function() {
diff --git a/template/accordion/accordion-group.html b/template/accordion/accordion-group.html
index d5b8a256e2..ff5de36e0d 100644
--- a/template/accordion/accordion-group.html
+++ b/template/accordion/accordion-group.html
@@ -1,4 +1,4 @@
-<div class="panel {{panelClass || 'panel-default'}}">
+<div class="panel">
   <div class="panel-heading" ng-keypress="toggleOpen($event)">
     <h4 class="panel-title">
       <div tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" uib-accordion-transclude="heading"><span ng-class="{'text-muted': isDisabled}">{{heading}}</span></div>