diff --git a/awesomerc.lua.in b/awesomerc.lua.in
index 5b55c0899..ca91d7540 100644
--- a/awesomerc.lua.in
+++ b/awesomerc.lua.in
@@ -317,7 +317,10 @@ function hook_manage(c)
     -- if they're not focusable, so set border anyway.
     c:border_set({ width = border_width, color = border_normal })
     c:focus_set()
-    if c:name_get():lower():find("mplayer") then
+    if c:name_get():lower():find("pinentry") then
+        c:floating_set(true)
+    end
+    if c:name_get():find("mplayer") then
         c:floating_set(true)
     end
 end