diff --git a/css/app-sidebar.scss b/css/app-sidebar.scss
index a7c6f9f774..6c4da4816c 100644
--- a/css/app-sidebar.scss
+++ b/css/app-sidebar.scss
@@ -21,8 +21,7 @@
  */
 
 .app-sidebar,
-.event-popover .popover-inner {
-
+.event-popover .popover__inner {
 	.app-sidebar-header__figure {
 		height: unset !important;
 	}
@@ -614,7 +613,7 @@
 }
 
 .timezone-popover-wrapper {
-	.tooltip-inner.popover-inner {
+	.popover__inner {
 		padding: 20px;
 	}
 
@@ -628,7 +627,9 @@
 }
 
 .event-popover {
-	.popover-inner {
+	padding: 5px 8px;
+
+	.popover__inner {
 		text-align: left;
 		max-width: 450px;
 		width: 450px;
@@ -646,7 +647,7 @@
 			border-top-right-radius: var(--border-radius);
 		}
 
-		.popover-inner {
+		.popover__inner {
 			max-width: unset !important;
 		}
 
@@ -694,8 +695,8 @@
 	}
 }
 
-.event-popover.tooltip[x-placement^='bottom'] {
-	.popover-arrow {
+.event-popover[x-placement^='bottom'] {
+	.popover__arrow {
 		border-bottom-color: var(--color-background-dark);
 	}
 }
diff --git a/src/views/EditSidebar.vue b/src/views/EditSidebar.vue
index 929c5ebc5f..1a52123d0b 100644
--- a/src/views/EditSidebar.vue
+++ b/src/views/EditSidebar.vue
@@ -24,7 +24,6 @@
 
 <template>
 	<AppSidebar
-		v-show="isVisible"
 		:title="title"
 		:title-editable="!isReadOnly && !isLoading"
 		:title-placeholder="$t('calendar', 'Event title')"