1 files changed, 10 insertions, 0 deletions
diff --git a/webapp/components/sidebar_right.jsx b/webapp/components/sidebar_right.jsx
index 1be2a3287..da7ff818d 100644
--- a/webapp/components/sidebar_right.jsx
+++ b/webapp/components/sidebar_right.jsx
@@ -74,6 +74,12 @@ export default class SidebarRight extends React.Component {
         if (isOpen !== willOpen) {
             PostStore.jumpPostsViewSidebarOpen();
         }
+
+        if (!isOpen && willOpen) {
+            this.setState({
+                expanded: false
+            });
+        }
     }
 
     doStrangeThings() {
@@ -191,6 +197,10 @@ export default class SidebarRight extends React.Component {
             );
         }
 
+        if (!content) {
+            expandedClass = '';
+        }
+
         return (
             <div
                 className={'sidebar--right ' + expandedClass}