diff --git a/env/.local/scripts/hypr/utils/windows/window-action-picker b/env/.local/scripts/hypr/utils/windows/window-action-picker
index 6685014..8ffe99c 100755
--- a/env/.local/scripts/hypr/utils/windows/window-action-picker
+++ b/env/.local/scripts/hypr/utils/windows/window-action-picker
@@ -80,6 +80,36 @@ move_to_workspace() {
   return $?
 }
 
+toggle_floating() {
+  log "Toggling floating..."
+  local did_handle="0"
+  local should_prompt_for_size="1"
+  local is_floating=$(hyprctl clients -j | jq ".[] | select(.address == \"$address\") | .floating")
+
+  if [[ $is_floating == "false" ]]; then
+    gum confirm "Would you like to set the size of the float?"
+    should_prompt_for_size=$?
+  fi
+
+  if [[ $should_prompt_for_size == "0" ]]; then
+    log "Prompting for size..."
+    placeholder="Example: 80% or 1000"
+    width=$(gum input --placeholder="$placeholder" --header="Window Width:")
+    height=$(gum input --placeholder="$placeholder" --header="Window Height:")
+    if [[ -n $width ]] && [[ -n $height ]]; then
+      "$SCRIPTS/hypr/utils/windows/window-toggle-floating" "$address" --width "$width" --height "$height"
+      did_handle="1"
+    else
+      log --warning "Did not get both width: '$width' and height: '$height', not setting window size."
+    fi
+  fi
+
+  if [[ $did_handle == "0" ]]; then
+    "$SCRIPTS/hypr/utils/windows/window-toggle-floating" "$address"
+  fi
+
+}
+
 make_selection() {
   log "Prompting for window action..."
   local choices=(
@@ -88,11 +118,12 @@ make_selection() {
     "Close the selected window and go back to the window list.:Close window and back"
     "Move the selected window to another workspace, focusing the window.\n\nA workspace picker will be presented to choose which workspace to move to.:Move to workspace"
     "Move the selected window to another workspace, without focusing the window.\n\nA workspace picker will be presented to choose which workspace to move to.:Move to workspace - silent"
+    "Toggles the selected windows floating property.\n\nIf the window is not floating then you will be prompted if you\nwant to set the size or not.:Toggle floating"
     "Copy the window address to the system clipboard:Copy to clipboard"
     "Move back to window picker and reload windows.:Back"
     "Quit:Quit"
   )
-  local preview_action="$SCRIPTS/hypr/preview-stats window $address \"{title, workspace, address}\""
+  local preview_action="$SCRIPTS/hypr/preview-stats window $address \"{title, workspace, address, floating}\""
   local choice=$(
     printf "%s\n" "${choices[@]}" |
       fzf --style=full --footer="$(action_footer)" \
@@ -134,6 +165,8 @@ handle_selection() {
     move_silent_flag="1"
     move_to_workspace
     resp="back"
+  elif [[ $choice == "Toggle floating" ]]; then
+    toggle_floating
   elif [[ $choice == "Back" ]]; then
     resp="back"
   fi
@@ -155,64 +188,6 @@ if [[ -z $address ]]; then
   exit 1
 fi
 
-<<<<<<< Updated upstream
 res=$(make_selection | handle_selection)
 log "Action result: $res"
 echo "$res"
-=======
-log "Prompting for window action..."
-
-choices=(
-  "Focus the selected window.:Focus window"
-  "Close the selected window.:Close window"
-  "Close the selected window and go back to the window list.:Close window and back"
-  "Move the selected window to another workspace, focusing the window.\n\nA workspace picker will be presented to choose which workspace to move to.:Move to workspace"
-  "Move the selected window to another workspace, without focusing the window.\n\nA workspace picker will be presented to choose which workspace to move to.:Move to workspace - silent"
-  "Copy the window address to the system clipboard:Copy to clipboard"
-  "Move back to window picker and reload windows.:Back"
-  "Quit:Quit"
-)
-preview_action="$SCRIPTS/hypr/preview-stats window $address \"{title, workspace, address}\""
-choice=$(
-  printf "%s\n" "${choices[@]}" |
-    fzf --style=full --footer="$(action_footer)" \
-      --delimiter=':' --with-nth=2 \
-      --header="What should we do with the selected window?" \
-      --preview-label="[ Description ]" \
-      --preview="echo -e {1}; echo -e '\n\n\e[35mSelected Window:\e[0m'; $preview_action;"
-)
-if [[ $? -gt 0 ]]; then
-  log --error "Unexpected fzf status: $?"
-  exit $?
-fi
-
-# Set choice to just the action portion.
-choice="${choice#*:}"
-log "Window action choice: $choice"
-
-# Set appropriate flags based on the choice and perform the action on the window address.
-if [[ $choice == "Quit" ]]; then
-  exit 0
-elif [[ $choice == "Close window" ]]; then
-  "$SCRIPTS/hypr/close-windows" "$address"
-elif [[ $choice == "Close window and back" ]]; then
-  "$SCRIPTS/hypr/close-windows" "$address"
-  should_go_back="1"
-elif [[ $choice == "Copy to clipboard" ]]; then
-  echo $address | wl-copy
-elif [[ $choice == "Focus window" ]]; then
-  focus_window
-elif [[ $choice == "Move to workspace" ]]; then
-  move_to_workspace
-elif [[ $choice == "Move to workspace - silent" ]]; then
-  move_silent_flag="1"
-  move_to_workspace
-elif [[ $choice == "Back" ]]; then
-  should_go_back="1"
-fi
-
-# TODO: Maybe we just echo out a 'back' message.
-if [[ $should_go_back == "1" ]]; then
-  exit 69
-fi
->>>>>>> Stashed changes