diff --git a/src/components/FormRow.js b/src/components/FormRow.js
index 44331b3e2..4deafbc52 100644
--- a/src/components/FormRow.js
+++ b/src/components/FormRow.js
@@ -28,18 +28,19 @@ function parseFeedback(feedback) {
 
 const FormRow = props => {
   const {
-    id,
-    size,
-    label,
+    children,
     color,
-    state,
-    hint,
     feedback,
-    required,
-    type,
-    children,
+    hint,
+    id,
     inline,
+    label,
+    required,
+    rowClassName,
+    size,
     stacked,
+    state,
+    type,
     width,
     ...attributes
   } = props;
@@ -55,7 +56,11 @@ const FormRow = props => {
   const inputContainerWidth = stacked ? 12 : 9;
 
   return (
-    <FormGroup row color={rowColor}>
+    <FormGroup
+      row
+      className={rowClassName}
+      color={rowColor}
+    >
       {label && (
         <Label for={id} sm={labelWidth} size={size} className={labelAlignment}>
           {label}
@@ -91,6 +96,7 @@ FormRow.propTypes = {
     PropTypes.object
   ]),
   required: PropTypes.bool,
+  rowClassName: PropTypes.string,
   type: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.element,
@@ -102,13 +108,14 @@ FormRow.propTypes = {
 };
 
 FormRow.defaultProps = {
-  label: '',
-  hint: '',
   feedback: '',
-  required: false,
-  type: 'text',
+  hint: '',
   inline: false,
+  label: '',
+  required: false,
+  rowClassName: '',
   stacked: false,
+  type: 'text',
   width: { xs: 12 }
 };
 
diff --git a/test/components/FormRow.spec.js b/test/components/FormRow.spec.js
index 9d3ade5ba..e3d03fca0 100644
--- a/test/components/FormRow.spec.js
+++ b/test/components/FormRow.spec.js
@@ -113,6 +113,13 @@ describe('<FormRow />', () => {
     });
   });
 
+  describe('with className', () => {
+    const component = shallow(
+      <FormRow label="First Name" rowClassName="balloob" />
+    );
+    assert(component.hasClass('balloob'));
+  });
+
   describe('with hint', () => {
     const component = shallow(
       <FormRow label="First Name" hint="hint" />