diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a402df5..a8d03049 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - `format-offset` being ignored ([`#2643`](https://github.com/polybar/polybar/pull/2643))
 - Negative struts (`margin-bottom`, `margin-top`) being ignored ([`#2642`](https://github.com/polybar/polybar/issues/2642), [`#2644`](https://github.com/polybar/polybar/pull/2644))
+- Positioning in awesomeWM ([`#2651`](https://github.com/polybar/polybar/pull/2651))
 
 ## [3.6.1] - 2022-03-05
 ### Build
@@ -166,8 +167,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Empty color values are no longer treated as invalid and no longer produce an error.
 
-[Unreleased]: https://github.com/polybar/polybar/compare/3.6.1...HEAD
-[3.6.1]: https://github.com/polybar/polybar/releases/tag/3.6.1
+[Unreleased]: https://github.com/polybar/polybar/compare/3.6.0...HEAD
 [3.6.0]: https://github.com/polybar/polybar/releases/tag/3.6.0
 [3.5.7]: https://github.com/polybar/polybar/releases/tag/3.5.7
 [3.5.6]: https://github.com/polybar/polybar/releases/tag/3.5.6
diff --git a/include/components/bar.hpp b/include/components/bar.hpp
index e16f9563..384bb8c3 100644
--- a/include/components/bar.hpp
+++ b/include/components/bar.hpp
@@ -65,6 +65,8 @@ class bar : public xpp::event::sink<evt::button_press, evt::expose, evt::propert
   void reconfigure_wm_hints();
   void broadcast_visibility();
 
+  void map_window();
+
   void trigger_click(mousebtn btn, int pos);
 
   void handle(const evt::client_message& evt) override;
diff --git a/src/components/bar.cpp b/src/components/bar.cpp
index 6a2ed49a..c89c6dc8 100644
--- a/src/components/bar.cpp
+++ b/src/components/bar.cpp
@@ -452,14 +452,8 @@ void bar::show() {
   try {
     m_log.info("Showing bar window");
     m_sig.emit(visibility_change{true});
-    /**
-     * First reconfigures the window so that WMs that discard some information
-     * when unmapping have the correct window properties (geometry etc).
-     */
-    reconfigure_window();
-    m_connection.map_window_checked(m_opts.window);
+    map_window();
     m_connection.flush();
-    m_visible = true;
     parse(string{m_lastinput}, true);
   } catch (const exception& err) {
     m_log.err("Failed to map bar window (err=%s", err.what());
@@ -630,6 +624,25 @@ void bar::broadcast_visibility() {
   }
 }
 
+void bar::map_window() {
+  /**
+   * First reconfigures the window so that WMs that discard some information
+   * when unmapping have the correct window properties (geometry etc).
+   */
+  reconfigure_window();
+
+  m_log.trace("bar: Map window");
+  m_connection.map_window_checked(m_opts.window);
+
+  /*
+   * Required by AwesomeWM. AwesomeWM does not seem to respect polybar's position if WM_NORMAL_HINTS are set before
+   * mapping. Additionally updating the window position after mapping seems to fix that.
+   */
+  reconfigure_pos();
+
+  m_visible = true;
+}
+
 void bar::trigger_click(mousebtn btn, int pos) {
   tags::action_t action = m_action_ctxt->has_action(btn, pos);
 
@@ -883,10 +896,8 @@ void bar::start() {
   m_connection.ensure_event_mask(m_opts.window, XCB_EVENT_MASK_STRUCTURE_NOTIFY);
 
   m_log.info("Bar window: %s", m_connection.id(m_opts.window));
-  reconfigure_window();
 
-  m_log.trace("bar: Map window");
-  m_connection.map_window_checked(m_opts.window);
+  map_window();
 
   // With the mapping, the absolute position of our window may have changed (due to re-parenting for example).
   // Notify all components that depend on the absolute bar position (such as the background manager).
diff --git a/src/x11/icccm.cpp b/src/x11/icccm.cpp
index b4fffe39..db0894f9 100644
--- a/src/x11/icccm.cpp
+++ b/src/x11/icccm.cpp
@@ -1,4 +1,5 @@
 #include "x11/icccm.hpp"
+
 #include "x11/atoms.hpp"
 
 POLYBAR_NS
@@ -33,14 +34,14 @@ namespace icccm_util {
   bool get_wm_urgency(xcb_connection_t* c, xcb_window_t w) {
     xcb_icccm_wm_hints_t hints;
     if (xcb_icccm_get_wm_hints_reply(c, xcb_icccm_get_wm_hints(c, w), &hints, NULL)) {
-      if(xcb_icccm_wm_hints_get_urgency(&hints) == XCB_ICCCM_WM_HINT_X_URGENCY)
+      if (xcb_icccm_wm_hints_get_urgency(&hints) == XCB_ICCCM_WM_HINT_X_URGENCY)
         return true;
     }
     return false;
   }
 
   void set_wm_size_hints(xcb_connection_t* c, xcb_window_t w, int x, int y, int width, int height) {
-    xcb_size_hints_t hints;
+    xcb_size_hints_t hints{};
 
     xcb_icccm_size_hints_set_size(&hints, false, width, height);
     xcb_icccm_size_hints_set_min_size(&hints, width, height);
@@ -50,6 +51,6 @@ namespace icccm_util {
 
     xcb_icccm_set_wm_size_hints(c, w, XCB_ATOM_WM_NORMAL_HINTS, &hints);
   }
-}
+} // namespace icccm_util
 
 POLYBAR_NS_END