diff --git a/CHANGELOG b/CHANGELOG
index 8fd1c9d..9f9942b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 Roundcube Webmail Swipe
 =======================
 
+Version 0.3.2 (2020-12-20, rc-1.4.4)
+=================================================
+ * Fix swipe-select action (#15)
+
 Version 0.3.1 (2020-11-20, rc-1.4.4)
 =================================================
  * Various code improvements
diff --git a/swipe.js b/swipe.js
index 88d043c..31c15bd 100644
--- a/swipe.js
+++ b/swipe.js
@@ -64,7 +64,9 @@ rcube_webmail.prototype.swipe = {
             rcmail.command(command, '', props.obj, props.originalEvent, true);
         }
         else if (type == 'select') {
-            rcmail.env.swipe_list.highlight_row(props.uid, true);
+            // Async action, do not override selection
+            rcmail.env[rcmail.env.swipe_selection_id] = null;
+            rcmail.env.swipe_list.select_row(props.uid, CONTROL_KEY, true);
         }
         else {
             var prev_command = rcmail.commands[command];