diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index c8006107d..e3379981e 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -1721,6 +1721,10 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
 }
 
 - (void)setupActions {
+    if (![self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+        return;
+    }
+    
     RoomInputToolbarView *roomInputView = ((RoomInputToolbarView *) self.inputToolbarView);
     __weak typeof(self) weakSelf = self;
     roomInputView.actionsBar.actionItems = @[
@@ -1728,7 +1732,9 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
             if (weakSelf)
             {
                 typeof(self) self = weakSelf;
-                roomInputView.actionMenuOpened = NO;
+                if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                    ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
+                }
                 [self showCameraControllerAnimated:YES];
             }
         }],
@@ -1736,7 +1742,9 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
             if (weakSelf)
             {
                 typeof(self) self = weakSelf;
-                roomInputView.actionMenuOpened = NO;
+                if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                    ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
+                }
                 [self showMediaPickerAnimated:YES];
             }
         }],
@@ -1744,7 +1752,9 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
             if (weakSelf)
             {
                 typeof(self) self = weakSelf;
-                roomInputView.actionMenuOpened = NO;
+                if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                    ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
+                }
                 [self roomInputToolbarViewPresentStickerPicker];
             }
         }],
@@ -1752,7 +1762,9 @@ NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNo
             if (weakSelf)
             {
                 typeof(self) self = weakSelf;
-                roomInputView.actionMenuOpened = NO;
+                if ([self.inputToolbarView isKindOfClass:RoomInputToolbarView.class]) {
+                    ((RoomInputToolbarView *) self.inputToolbarView).actionMenuOpened = NO;
+                }
                 [self roomInputToolbarViewDidTapFileUpload];
             }
         }],
diff --git a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
index c76bbd038..aef222b14 100644
--- a/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
+++ b/Riot/Modules/Room/Views/InputToolbar/RoomInputToolbarView.m
@@ -393,7 +393,7 @@ const double RoomInputToolbarViewContextBarHeight = 30;
             }];
         }
         
-        [UIView animateWithDuration:.4 delay:0 usingSpringWithDamping:0.45 initialSpringVelocity:5 options:UIViewAnimationOptionCurveEaseIn animations:^{
+        [UIView animateWithDuration:.4 delay:0 usingSpringWithDamping:0.45 initialSpringVelocity:7 options:UIViewAnimationOptionCurveEaseIn animations:^{
             self.attachMediaButton.transform = actionMenuOpened ? CGAffineTransformMakeRotation(M_PI * 3 / 4) : CGAffineTransformIdentity;
         } completion:^(BOOL finished) {
         }];