diff --git a/ADAbot/ADAbot.xcodeproj/project.xcworkspace/xcuserdata/joeloksanen.xcuserdatad/UserInterfaceState.xcuserstate b/ADAbot/ADAbot.xcodeproj/project.xcworkspace/xcuserdata/joeloksanen.xcuserdatad/UserInterfaceState.xcuserstate
index 0773aa516f590f06969ee600e4f6af0290f255e0..aba7d1fbd42498ccc6a697fe308f25495375485f 100644
Binary files a/ADAbot/ADAbot.xcodeproj/project.xcworkspace/xcuserdata/joeloksanen.xcuserdatad/UserInterfaceState.xcuserstate and b/ADAbot/ADAbot.xcodeproj/project.xcworkspace/xcuserdata/joeloksanen.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/ADAbot/ADAbot/Chat/FeatureView.swift b/ADAbot/ADAbot/Chat/FeatureView.swift
index 491aae6b0c0e19fb7f3eae7013744f6715814e0e..62c4e70742b585ab21e0027c2c299802c4d44a53 100644
--- a/ADAbot/ADAbot/Chat/FeatureView.swift
+++ b/ADAbot/ADAbot/Chat/FeatureView.swift
@@ -38,7 +38,11 @@ struct FeatureView: View {
               ForEach(self.arguments, id: \.id) { argument in
                 FeatureBubble(argument: argument,
                               showingQueryOptionsForArgument: self.$showingQueryOptionsForArgument)
-                  .onTapGesture { self.showingQueryOptionsForArgument = argument }
+                  .onTapGesture {
+                    withAnimation(.easeInOut(duration: 0.3)) {
+                      self.showingQueryOptionsForArgument = argument
+                    }
+                  }
               }
               Spacer()
                 .frame(width: 10)
diff --git a/ADAbot/ADAbot/Chat/MessageView.swift b/ADAbot/ADAbot/Chat/MessageView.swift
index aec1e134c0e991673821e4f2714c36eeeb3ce878..f7c420b8542088d38a4cf9d0374230b5f23c7225 100644
--- a/ADAbot/ADAbot/Chat/MessageView.swift
+++ b/ADAbot/ADAbot/Chat/MessageView.swift
@@ -51,10 +51,10 @@ struct MessageView: View {
             .background(MessageBubble(sender: message.sender).foregroundColor(sent ? bubbleColors[message.sender] : FeatureView.bubbleColor))
             .frame(minWidth: 0, maxWidth: maxWidth, alignment: message.sender == .ADA ? .leading : .trailing)
             .onTapGesture {
-              if self.message.sender == .ADA {
-                self.chatManager.showOptionsFor(self.message as! ADAMessage)
-              } else if !self.sent {
-                withAnimation(Animation.easeInOut(duration: 0.3)) {
+              withAnimation(.easeInOut(duration: 0.3)) {
+                if self.message.sender == .ADA {
+                  self.chatManager.showOptionsFor(self.message as! ADAMessage)
+                } else if !self.sent {
                   self.chatManager.sendQuery(query: self.query!)
                   self.sent = true
                 }