diff --git a/src/app/components/shared/tag-cloud/tag-cloud.component.html b/src/app/components/shared/tag-cloud/tag-cloud.component.html
index 87579d49a27660d41fe018833fd79eec836ed7a7..b818b9809361b0c1c17050f04154a7fda5b2a9f3 100644
--- a/src/app/components/shared/tag-cloud/tag-cloud.component.html
+++ b/src/app/components/shared/tag-cloud/tag-cloud.component.html
@@ -16,7 +16,7 @@
           [height]="options.height"
           [overflow]="options.overflow"
           [delay]="options.delay"
-          [randomizeAngle]="options.randomizeAngle"
+          [randomizeAngle]="false"
           [zoomOnHover]="zoomOnHoverOptions"
           [realignOnResize]="false">
         </angular-tag-cloud>
diff --git a/src/app/components/shared/tag-cloud/tag-cloud.component.scss b/src/app/components/shared/tag-cloud/tag-cloud.component.scss
index 74753756847711bf81bce455fce2ff9ba66402ca..c7f5e1cf8ec487752240700f43686de7bbec8c19 100644
--- a/src/app/components/shared/tag-cloud/tag-cloud.component.scss
+++ b/src/app/components/shared/tag-cloud/tag-cloud.component.scss
@@ -7,6 +7,7 @@ ars-fill {
 mat-drawer-container {
   height: 100%;
   width: 100%;
+  position: fixed;
 }
 
 mat-drawer {
diff --git a/src/app/components/shared/tag-cloud/tag-cloud.component.ts b/src/app/components/shared/tag-cloud/tag-cloud.component.ts
index 8bdee24f7e582277bca252d45c389572483c5be6..4cfd621062c94d1811e4b2e81b1151b796aa86e6 100644
--- a/src/app/components/shared/tag-cloud/tag-cloud.component.ts
+++ b/src/app/components/shared/tag-cloud/tag-cloud.component.ts
@@ -160,8 +160,7 @@ export class TagCloudComponent implements OnInit {
     height: 0.99,
     overflow: false,
     font: 'Georgia', // not working
-    delay: 0,
-    randomizeAngle: false
+    delay: 0
   };
   zoomOnHoverOptions: ZoomOnHoverOptions = {
     scale: 1.3, // Elements will become 130 % of current size on hover
@@ -174,6 +173,7 @@ export class TagCloudComponent implements OnInit {
   debounceTimer = 0;
   lastDebounceTime = 0;
   configurationOpen = false;
+  randomizeAngle = false;
 
   constructor(private commentService: CommentService,
               private spacyService: SpacyService,
@@ -271,7 +271,12 @@ export class TagCloudComponent implements OnInit {
     this.zoomOnHoverOptions.scale = data.hoverScale;
     this.zoomOnHoverOptions.transitionTime = data.hoverTime;
     this.options.delay = data.delayWord;
-    this.options.randomizeAngle = data.randomAngles;
+    this.randomizeAngle = data.randomAngles;
+    if (this.randomizeAngle) {
+      this.data.forEach(e => e.rotate = Math.floor(Math.random() * 30 - 15));
+    } else {
+      this.data.forEach(e => e.rotate = 0);
+    }
     this.updateTagCloud();
     if (save) {
       localStorage.setItem('tagCloudConfiguration', JSON.stringify(data));
@@ -316,7 +321,7 @@ export class TagCloudComponent implements OnInit {
       map.forEach((val, key) => {
           this.data.push(new TagComment(null,
             true, null, null,
-            /*Math.floor(Math.random() * 30 - 15)*/0, key,
+            this.randomizeAngle ? Math.floor(Math.random() * 30 - 15) : 0, key,
             'TODO', val));
         }
       );