diff --git a/admin/write-js.php b/admin/write-js.php
index 8b370446..5588bbd6 100644
--- a/admin/write-js.php
+++ b/admin/write-js.php
@@ -218,12 +218,23 @@ $(document).ready(function() {
         return false;
     });
 
-
     // 高级选项控制
     $('#advance-panel-btn').click(function() {
         $('#advance-panel').toggle();
         return false;
     });
+
+    // 自动隐藏密码框
+    $('#visibility').change(function () {
+        var val = $(this).val(), password = $('#post-password');
+        console.log(val);
+
+        if ('password' == val) {
+            password.removeClass('hidden');
+        } else {
+            password.addClass('hidden');
+        }
+    });
     
     // 草稿删除确认
     $('.edit-draft-notice a').click(function () {
diff --git a/admin/write-page.php b/admin/write-page.php
index 92acb854..aba77a73 100644
--- a/admin/write-page.php
+++ b/admin/write-page.php
@@ -89,10 +89,12 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
                         <div id="advance-panel">
                             <section class="typecho-post-option visibility-option">
                                 <label class="typecho-label"><?php _e('公开度'); ?></label>
-                                <ul>
-                                    <li><input id="publish" value="publish" name="visibility" type="radio"<?php if ($page->status == 'publish' || !$page->status) { ?> checked="true"<?php } ?> /> <label for="publish"><?php _e('公开'); ?></label></li>
-                                    <li><input id="hidden" value="hidden" name="visibility" type="radio"<?php if ($page->status == 'hidden') { ?> checked="true"<?php } ?> /> <label for="hidden"><?php _e('隐藏'); ?></label></li>
-                                </ul>
+                                <p>
+                                <select id="visibility" name="visibility">
+                                    <option value="publish"<?php if ($page->status == 'publish' || !$page->status): ?> selected<?php endif; ?>><?php _e('公开'); ?></option>
+                                    <option value="hidden"<?php if ($page->status == 'hidden'): ?> selected<?php endif; ?>><?php _e('隐藏'); ?></option>
+                                </select>
+                                </p>
                             </section>
 
                             <section class="typecho-post-option allow-option">
diff --git a/admin/write-post.php b/admin/write-post.php
index 0681a3d4..b65429c9 100644
--- a/admin/write-post.php
+++ b/admin/write-post.php
@@ -100,25 +100,24 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                         <div id="advance-panel">
                             <?php if($user->pass('editor', true)): ?>
                             <section class="typecho-post-option visibility-option">
-                                <label class="typecho-label"><?php _e('公开度'); ?></label>
-                                <ul>
+                                <label for="visibility" class="typecho-label"><?php _e('公开度'); ?></label>
+                                <p>
+                                <select id="visibility" name="visibility">
                                     <?php if ($user->pass('editor', true)): ?>
-                                    <li><input id="publish" value="publish" name="visibility" type="radio"<?php if (($post->status == 'publish' && !$post->password) || !$post->status) { ?> checked="true"<?php } ?> /> <label for="publish"><?php _e('公开'); ?></label></li>
-                                    <li><input id="hidden" value="hidden" name="visibility" type="radio"<?php if ($post->status == 'hidden') { ?> checked="true"<?php } ?> /> <label for="hidden"><?php _e('隐藏'); ?></label></li>
-                                    <li><input id="password" value="password" name="visibility" type="radio"<?php if ($post->password) { ?> checked="true"<?php } ?> /> <label for="password"><?php _e('密码保护'); ?> <input type="text" id="post-password" name="password" class="text-s" value="<?php $post->password(); ?>" size="16" /></label></li>
-                                    <li><input id="private" value="private" name="visibility" type="radio"<?php if ($post->status == 'private') { ?> checked="true"<?php } ?> /> <label for="private"><?php _e('私密'); ?></label></li>
+                                    <option value="publish"<?php if (($post->status == 'publish' && !$post->password) || !$post->status): ?> selected<?php endif; ?>><?php _e('公开'); ?></option>
+                                    <option value="hidden"<?php if ($post->status == 'hidden'): ?> selected<?php endif; ?>><?php _e('隐藏'); ?></option>
+                                    <option value="password"<?php if (strlen($post->password) > 0): ?> selected<?php endif; ?>><?php _e('密码保护'); ?></option>
+                                    <option value="private"<?php if ($post->status == 'private'): ?> selected<?php endif; ?>><?php _e('私密'); ?></option>
                                     <?php endif; ?>
-                                    <li><input id="waiting" value="waiting" name="visibility" type="radio"<?php if (!$user->pass('editor', true) || $post->status == 'waiting') { ?> checked="true"<?php } ?> /> <label for="waiting"><?php _e('待审核'); ?></label></li>
-                                </ul>
+                                    <option value="waiting"<?php if (!$user->pass('editor', true) || $post->status == 'waiting'): ?> selected<?php endif; ?>><?php _e('待审核'); ?></option>
+                                </select>
+                                </p>
+                                <p id="post-password"<?php if (strlen($post->password) == 0): ?> class="hidden"<?php endif; ?>>
+                                <input type="text" name="password" class="text-s" value="<?php $post->password(); ?>" size="16" placeholder="<?php _e('内容密码'); ?>" />
+                                </p>
                             </section>
                             <?php endif; ?>
 
-                            <section class="typecho-post-option">
-                                <label for="trackback" class="typecho-label"><?php _e('引用通告'); ?></label>
-                                <p><textarea id="trackback" class="w-100 mono" name="trackback" rows="3"></textarea></p>
-                                <p class="description"><?php _e('每一行一个引用地址, 用回车隔开'); ?></p>
-                            </section>
-
                             <section class="typecho-post-option allow-option">
                                 <label class="typecho-label"><?php _e('权限控制'); ?></label>
                                 <ul>
@@ -130,6 +129,13 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
                                     <label for="allowFeed"><?php _e('允许在聚合中出现'); ?></label></li>
                                 </ul>
                             </section>
+                            
+                            <section class="typecho-post-option">
+                                <label for="trackback" class="typecho-label"><?php _e('引用通告'); ?></label>
+                                <p><textarea id="trackback" class="w-100 mono" name="trackback" rows="2"></textarea></p>
+                                <p class="description"><?php _e('每一行一个引用地址, 用回车隔开'); ?></p>
+                            </section>
+
                             <?php Typecho_Plugin::factory('admin/write-post.php')->advanceOption($post); ?>
                         </div><!-- end #advance-panel -->