--- lcl/comctrls.pp
+++ lcl/comctrls.pp
@@ -3287,7 +3287,8 @@
     tvoShowSeparators,
     tvoToolTips,
     tvoNoDoubleClickExpand,
-    tvoThemedDraw
+    tvoThemedDraw,
+    tvoEmptySpaceUnselect
     );
   TTreeViewOptions = set of TTreeViewOption;
 
@@ -3425,7 +3426,8 @@
     function IsStoredBackgroundColor: Boolean;
     procedure HintMouseLeave(Sender: TObject);
     procedure ImageListChange(Sender: TObject);
-    function MouseDownNode(X, Y: Integer): TTreeNode;
+    function MouseDownNode(X, Y: Integer; const fIncludeExpandSign: Boolean =
+      False): TTreeNode;
     procedure OnChangeTimer(Sender: TObject);
     procedure SetAutoExpand(Value: Boolean);
     procedure SetBackgroundColor(Value: TColor);
--- lcl/include/treeview.inc
+++ lcl/include/treeview.inc
@@ -2797,7 +2797,7 @@
     end;
 
     //select again
-    bGoNext := (FirstNode.Index <= Node.Index);
+    bGoNext := (FirstNode.AbsoluteIndex <= Node.AbsoluteIndex);
     I := FirstNode;
     I.MultiSelected:=True;
     while (I<>Node) do
@@ -3861,6 +3861,7 @@
 begin
   if MultiSelect <> AValue then
   begin
+    ClearSelection;
     if AValue then
       Include(FOptions,tvoAllowMultiselect)
     else
@@ -3974,9 +3975,13 @@
 
 function TCustomTreeView.GetNodeAt(X, Y: Integer): TTreeNode;
 begin
-  if (X >= BorderWidth) and (X < ClientWidth - BorderWidth) then
-    Result := GetNodeAtY(Y)
-  else
+  Result := GetNodeAtY(Y);
+  if not Assigned(Result) then
+    Exit;
+  if (not (tvoRowSelect in Options) and
+      ((X < Result.DisplayStateIconLeft) or (X >= Result.DisplayTextRight))) or
+     ((tvoRowSelect in Options) and     // row select
+      ((X < BorderWidth) or (X >= ClientWidth - BorderWidth))) then
     Result := nil;
 end;
 
@@ -5574,9 +5579,22 @@
   Result := FIndent >= 0;
 end;
 
-function TCustomTreeView.MouseDownNode(X, Y: Integer): TTreeNode;
-begin
-  Result := GetNodeAt(X, Y);
+function TCustomTreeView.MouseDownNode(X, Y: Integer; const fIncludeExpandSign:
+  Boolean): TTreeNode;
+begin
+  if fIncludeExpandSign then
+  begin
+    Result := GetNodeAtY(Y);
+    if Assigned(Result) then
+      if (not (tvoRowSelect in Options) and   // need to include DisplayExpandSignLeft
+          ((X < Result.DisplayExpandSignLeft) or (X >= Result.DisplayTextRight))) or
+         ((tvoRowSelect in Options) and     // row select
+          ((X < BorderWidth) or (X >= ClientWidth - BorderWidth))) then
+        Result := nil;
+  end
+  else
+    Result := GetNodeAt(X, Y);
+
   // Update the NodeSelected flag.
   FMouseDownNodeSelected := Assigned(Result) and
     (Result.Selected or ((tvoAllowMultiselect in Options) and Result.MultiSelected));
@@ -5601,16 +5619,25 @@
   if (Button = mbRight) and RightClickSelect and//right click
      (([ssDouble, ssTriple, ssQuad] * Shift) = []) and//single or first of a multi click
      not AllowMultiSelectWithCtrl(Shift) and//only when CTRL is not pressed
-     (CursorNode <> nil) and
-     (LogicalX >= CursorNode.DisplayStateIconLeft)//only after expand sign
+     (CursorNode <> nil)
   then
   begin
+    if not (tvoRowSelect in Options) and
+       (tvoEmptySpaceUnselect in Options) and
+       (LogicalX >= CursorNode.DisplayStateIconLeft) and
+       (LogicalX > CursorNode.DisplayTextRight) then
+      ClearSelection
+    else
     if not (tvoAllowMultiselect in Options) then
       Selected := CursorNode
     else
     if not FMouseDownNodeSelected then
       Items.SelectOnlyThis(CursorNode);
-  end;
+  end
+  else // empty space below last node
+  if (Button = mbRight) and RightClickSelect and (CursorNode = nil) and
+     (tvoEmptySpaceUnselect in Options) then
+    ClearSelection;
 
   if not Focused and CanFocus then
     SetFocus;
@@ -5618,7 +5645,7 @@
   inherited MouseDown(Button, Shift, X, Y);
 
   //CursorNode must be reassigned again - e.g. in OnMouseDown the node can be deleted or moved.
-  CursorNode := MouseDownNode(X, Y);
+  CursorNode := MouseDownNode(LogicalX, Y, True);
 
   //Flag is used for DblClick/TripleClick/QuadClick, so set it before testing ShiftState
   FMouseDownOnFoldingSign :=
@@ -5634,7 +5661,8 @@
     if FMouseDownOnFoldingSign then
       // mousedown occured on expand sign -> expand/collapse
       CursorNode.Expanded := not CursorNode.Expanded
-    else if LogicalX >= CursorNode.DisplayStateIconLeft then
+    else if (LogicalX >= CursorNode.DisplayStateIconLeft) or
+            (tvoRowSelect in Options) then
     begin
       // mousedown occured in text or icon -> select node and begin drag operation
       {$IFDEF VerboseDrag}
@@ -5671,12 +5699,18 @@
             Include(FStates, tvsSingleSelectOnMouseUp);
         end;
       end;
-    end;
+    end
+    else if tvoEmptySpaceUnselect in Options then
+      ClearSelection;
   end
   else// multi click
   if not (tvoNoDoubleClickExpand in Options) and (ssDouble in Shift)
   and (Button = mbLeft) and (CursorNode<>nil) then
-    CursorNode.Expanded := not CursorNode.Expanded;
+    CursorNode.Expanded := not CursorNode.Expanded
+  else  // empty space below last node
+  if (Button = mbLeft) and (CursorNode = nil) and (tvoEmptySpaceUnselect in Options) and
+     not AllowMultiSelectWithShift(Shift) and not AllowMultiSelectWithCtrl(Shift) then
+    ClearSelection;
 end;
 
 procedure TCustomTreeView.MouseMove(Shift: TShiftState; X, Y: Integer);