diff --git a/templates/partial/side.html.ep b/templates/partial/side.html.ep
index c64e275..f8d81f0 100644
--- a/templates/partial/side.html.ep
+++ b/templates/partial/side.html.ep
@@ -1,7 +1,7 @@
 % my $side_bar = content_block 'sidebar';
 
 % my $classes = '';
-%
+
 % if (length($side_bar) == 0) {
 %   if (my $nav = navigation('settings')) {
 %     $side_bar = b('<nav>' . $nav . '</nav>');
@@ -9,15 +9,22 @@
 %   };
 % }
 
+% my $is_empty_sidebar = $side_bar =~ /^\s*(<div[^>]*>\s*<\/div>\s*)*$/i;
+
+% if ($is_empty_sidebar) {
+%   $classes .= ' invisible';
+% };
+
 % if (length($side_bar) == 0 || stash('sidebar_off')) {
 %   $classes .= ' off';
 % } elsif (stash('sidebar_active')) {
 %   $classes .= ' active';
 % } elsif (stash('login_active') && !$classes) {
-%   $classes .= ' active';
+%   $classes .= ' invisible';
+% } elsif (!stash('login_active') && $side_bar =~ /<form.*class=".*login.*".*>/i) {
+%   $classes .= ' invisible';
 % };
 
-
 <aside tabindex="0" class="<%= $classes %>">
   <div>
     %= $side_bar